From 184b81303bf5a744527cb255ad0ad4ad04a114c3 Mon Sep 17 00:00:00 2001
From: houpengtao <houpengtao@huawei.com>
Date: Sun, 11 Jun 2023 14:39:03 +0800
Subject: [PATCH 1/2] use shared ptr

Signed-off-by: houpengtao <houpengtao@huawei.com>
---
 .../service/data_share/common/rdb_delegate.cpp                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp b/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp
index 8dcd025dd..4c8e3236d 100644
--- a/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp
+++ b/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp
@@ -159,7 +159,6 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> RdbDelegate::QuerySql(const std::
         ZLOGE("store is null");
         return nullptr;
     }
-    auto result = store_->QuerySql(sql);
-    return std::move(result);
+    return store_->QuerySql(sql);
 }
 } // namespace OHOS::DataShare
\ No newline at end of file
-- 
Gitee


From fdfce714d37d7bb24a89b03e6618f3d82640b285 Mon Sep 17 00:00:00 2001
From: leiiyb <leiyanbo@huawei.com>
Date: Sun, 11 Jun 2023 16:27:18 +0800
Subject: [PATCH 2/2] modify result

Signed-off-by: leiiyb <leiyanbo@huawei.com>
---
 .../service/data_share/common/db_delegate.h                     | 2 +-
 .../service/data_share/common/rdb_delegate.cpp                  | 2 +-
 .../service/data_share/common/rdb_delegate.h                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/distributeddataservice/service/data_share/common/db_delegate.h b/services/distributeddataservice/service/data_share/common/db_delegate.h
index b649c1a39..b0f648f54 100644
--- a/services/distributeddataservice/service/data_share/common/db_delegate.h
+++ b/services/distributeddataservice/service/data_share/common/db_delegate.h
@@ -39,7 +39,7 @@ public:
         const DataSharePredicates &predicates, const std::vector<std::string> &columns, int &errCode) = 0;
     virtual std::string Query(
         const std::string &sql, const std::vector<std::string> &selectionArgs = std::vector<std::string>()) = 0;
-    virtual std::shared_ptr<NativeRdb::AbsSharedResultSet> QuerySql(const std::string &sql) = 0;
+    virtual std::shared_ptr<NativeRdb::ResultSet> QuerySql(const std::string &sql) = 0;
 };
 
 class Id : public DistributedData::Serializable {
diff --git a/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp b/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp
index 4c8e3236d..81373b900 100644
--- a/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp
+++ b/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp
@@ -153,7 +153,7 @@ std::string RdbDelegate::Query(const std::string &sql, const std::vector<std::st
     return DistributedData::Serializable::Marshall(formatter);
 }
 
-std::shared_ptr<NativeRdb::AbsSharedResultSet> RdbDelegate::QuerySql(const std::string &sql)
+std::shared_ptr<NativeRdb::ResultSet> RdbDelegate::QuerySql(const std::string &sql)
 {
     if (store_ == nullptr) {
         ZLOGE("store is null");
diff --git a/services/distributeddataservice/service/data_share/common/rdb_delegate.h b/services/distributeddataservice/service/data_share/common/rdb_delegate.h
index 39e2c1195..02093dce5 100644
--- a/services/distributeddataservice/service/data_share/common/rdb_delegate.h
+++ b/services/distributeddataservice/service/data_share/common/rdb_delegate.h
@@ -39,7 +39,7 @@ public:
     std::shared_ptr<DataShareResultSet> Query(const std::string &tableName, const DataSharePredicates &predicates,
         const std::vector<std::string> &columns, int &errCode) override;
     std::string Query(const std::string &sql, const std::vector<std::string> &selectionArgs) override;
-    std::shared_ptr<NativeRdb::AbsSharedResultSet> QuerySql(const std::string &sql) override;
+    std::shared_ptr<NativeRdb::ResultSet> QuerySql(const std::string &sql) override;
 
 private:
     static std::atomic<int32_t> resultSetCount;
-- 
Gitee