From c7300bbe816d1257c10d0eab61339dcc257d00a1 Mon Sep 17 00:00:00 2001 From: wufengshan Date: Sat, 7 May 2022 15:01:16 +0800 Subject: [PATCH] Signed-off-by: wufengshan Changes to be committed: --- .../distributeddatafwk/src/data_query.cpp | 24 ++++++++++++------- .../single_kvstore_client_query_test.cpp | 16 ++++++------- .../distributeddata/src/js_query.cpp | 19 ++++++++------- .../distributeddata/include/data_query.h | 16 ++++++------- 4 files changed, 43 insertions(+), 32 deletions(-) diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/data_query.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/data_query.cpp index 22dd33299..96b4216ad 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/data_query.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/data_query.cpp @@ -336,8 +336,9 @@ DataQuery& DataQuery::IsNotNull(const std::string &field) return *this; } -DataQuery& DataQuery::InInt(const std::string &field, const std::vector &valueList) +DataQuery& DataQuery::In(const std::string &field, const std::vector &valueList) { + ZLOGD("DataQuery::In int"); std::string myField = field; if (ValidateField(myField)) { AppendCommonList(IN, TYPE_INTEGER, myField, valueList); @@ -345,8 +346,9 @@ DataQuery& DataQuery::InInt(const std::string &field, const std::vector &va return *this; } -DataQuery& DataQuery::InLong(const std::string &field, const std::vector &valueList) +DataQuery& DataQuery::In(const std::string &field, const std::vector &valueList) { + ZLOGD("DataQuery::In int64_t"); std::string myField = field; if (ValidateField(myField)) { AppendCommonList(IN, TYPE_LONG, myField, valueList); @@ -354,8 +356,9 @@ DataQuery& DataQuery::InLong(const std::string &field, const std::vector &valueList) +DataQuery& DataQuery::In(const std::string &field, const std::vector &valueList) { + ZLOGD("DataQuery::In double"); std::string myField = field; if (ValidateField(myField)) { AppendCommonList(IN, TYPE_DOUBLE, myField, valueList); @@ -363,8 +366,9 @@ DataQuery& DataQuery::InDouble(const std::string &field, const std::vector &valueList) +DataQuery& DataQuery::In(const std::string &field, const std::vector &valueList) { + ZLOGD("DataQuery::In string"); std::string myField = field; std::vector myValueList(valueList); if (ValidateField(myField)) { @@ -373,8 +377,9 @@ DataQuery& DataQuery::InString(const std::string &field, const std::vector &valueList) +DataQuery& DataQuery::NotIn(const std::string &field, const std::vector &valueList) { + ZLOGD("DataQuery::NotIn int"); std::string myField = field; if (ValidateField(myField)) { AppendCommonList(NOT_IN, TYPE_INTEGER, myField, valueList); @@ -382,8 +387,9 @@ DataQuery& DataQuery::NotInInt(const std::string &field, const std::vector return *this; } -DataQuery& DataQuery::NotInLong(const std::string &field, const std::vector &valueList) +DataQuery& DataQuery::NotIn(const std::string &field, const std::vector &valueList) { + ZLOGD("DataQuery::NotIn int64_t"); std::string myField = field; if (ValidateField(myField)) { AppendCommonList(NOT_IN, TYPE_LONG, myField, valueList); @@ -391,8 +397,9 @@ DataQuery& DataQuery::NotInLong(const std::string &field, const std::vector &valueList) +DataQuery& DataQuery::NotIn(const std::string &field, const std::vector &valueList) { + ZLOGD("DataQuery::NotIn double"); std::string myField = field; if (ValidateField(myField)) { AppendCommonList(NOT_IN, TYPE_DOUBLE, myField, valueList); @@ -400,8 +407,9 @@ DataQuery& DataQuery::NotInDouble(const std::string &field, const std::vector &valueList) +DataQuery& DataQuery::NotIn(const std::string &field, const std::vector &valueList) { + ZLOGD("DataQuery::NotIn string"); std::string myField = field; std::vector myValueList(valueList); if (ValidateField(myField)) { diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_query_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_query_test.cpp index 22355f7a7..2405232ae 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_query_test.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_query_test.cpp @@ -272,19 +272,19 @@ HWTEST_F(SingleKvStoreClientQueryTest, TestQueryC009, TestSize.Level1) ZLOGD("TestQueryC009 start"); DataQuery query; std::vector vectInt{ 10, 20, 30 }; - query.InInt("$.test_field_name", vectInt); + query.In("$.test_field_name", vectInt); EXPECT_TRUE(query.ToString().length() > 0); query.Reset(); std::vector vectLong{ (int64_t) 100, (int64_t) 200, (int64_t) 300 }; - query.InLong("$.test_field_name", vectLong); + query.In("$.test_field_name", vectLong); EXPECT_TRUE(query.ToString().length() > 0); query.Reset(); std::vector vectDouble{1.23, 2.23, 3.23}; - query.InDouble("$.test_field_name", vectDouble); + query.In("$.test_field_name", vectDouble); EXPECT_TRUE(query.ToString().length() > 0); query.Reset(); std::vector vectString{ "value 1", "value 2", "value 3" }; - query.InString("$.test_field_name", vectString); + query.In("$.test_field_name", vectString); EXPECT_TRUE(query.ToString().length() > 0); ZLOGD("TestQueryC009 end"); } @@ -301,19 +301,19 @@ HWTEST_F(SingleKvStoreClientQueryTest, TestQueryC010, TestSize.Level1) ZLOGD("TestQueryC010 start"); DataQuery query; std::vector vectInt{ 10, 20, 30 }; - query.NotInInt("$.test_field_name", vectInt); + query.NotIn("$.test_field_name", vectInt); EXPECT_TRUE(query.ToString().length() > 0); query.Reset(); std::vector vectLong{ (int64_t) 100, (int64_t) 200, (int64_t) 300 }; - query.NotInLong("$.test_field_name", vectLong); + query.NotIn("$.test_field_name", vectLong); EXPECT_TRUE(query.ToString().length() > 0); query.Reset(); std::vector vectDouble{ 1.23, 2.23, 3.23 }; - query.NotInDouble("$.test_field_name", vectDouble); + query.NotIn("$.test_field_name", vectDouble); EXPECT_TRUE(query.ToString().length() > 0); query.Reset(); std::vector vectString{ "value 1", "value 2", "value 3" }; - query.NotInString("$.test_field_name", vectString); + query.NotIn("$.test_field_name", vectString); EXPECT_TRUE(query.ToString().length() > 0); ZLOGD("TestQueryC010 end"); } diff --git a/frameworks/jskitsimpl/distributeddata/src/js_query.cpp b/frameworks/jskitsimpl/distributeddata/src/js_query.cpp index 2abc634ad..feda04777 100644 --- a/frameworks/jskitsimpl/distributeddata/src/js_query.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/js_query.cpp @@ -345,23 +345,25 @@ struct NumbersContext : public ContextBase { napi_value JsQuery::InNumber(napi_env env, napi_callback_info info) { + ZLOGD("Query::InNumber()"); auto ctxt = std::make_shared(); ctxt->GetNumberSync(env, info); NAPI_ASSERT(env, ctxt->status == napi_ok, "invalid arguments!"); auto& query = reinterpret_cast(ctxt->native)->query_; if (ctxt->innerType == NumberType::NUMBER_INT) { - query.InInt(ctxt->field, ctxt->intList); + query.In(ctxt->field, ctxt->intList); } else if (ctxt->innerType == NumberType::NUMBER_LONG) { - query.InLong(ctxt->field, ctxt->longList); + query.In(ctxt->field, ctxt->longList); } else if (ctxt->innerType == NumberType::NUMBER_DOUBLE) { - query.InDouble(ctxt->field, ctxt->doubleList); + query.In(ctxt->field, ctxt->doubleList); } return ctxt->self; } napi_value JsQuery::InString(napi_env env, napi_callback_info info) { + ZLOGD("Query::InString()"); struct StringsContext : public ContextBase { std::string field; std::vector valueList; @@ -379,23 +381,24 @@ napi_value JsQuery::InString(napi_env env, napi_callback_info info) NAPI_ASSERT(env, ctxt->status == napi_ok, "invalid arguments!"); auto& query = reinterpret_cast(ctxt->native)->query_; - query.InString(ctxt->field, ctxt->valueList); + query.In(ctxt->field, ctxt->valueList); return ctxt->self; } napi_value JsQuery::NotInNumber(napi_env env, napi_callback_info info) { + ZLOGD("Query::NotInNumber()"); auto ctxt = std::make_shared(); ctxt->GetNumberSync(env, info); NAPI_ASSERT(env, ctxt->status == napi_ok, "invalid arguments!"); auto& query = reinterpret_cast(ctxt->native)->query_; if (ctxt->innerType == NumberType::NUMBER_INT) { - query.NotInInt(ctxt->field, ctxt->intList); + query.NotIn(ctxt->field, ctxt->intList); } else if (ctxt->innerType == NumberType::NUMBER_LONG) { - query.NotInLong(ctxt->field, ctxt->longList); + query.NotIn(ctxt->field, ctxt->longList); } else if (ctxt->innerType == NumberType::NUMBER_DOUBLE) { - query.NotInDouble(ctxt->field, ctxt->doubleList); + query.NotIn(ctxt->field, ctxt->doubleList); } return ctxt->self; } @@ -420,7 +423,7 @@ napi_value JsQuery::NotInString(napi_env env, napi_callback_info info) NAPI_ASSERT(env, ctxt->status == napi_ok, "invalid arguments!"); auto& query = reinterpret_cast(ctxt->native)->query_; - query.NotInString(ctxt->field, ctxt->valueList); + query.NotIn(ctxt->field, ctxt->valueList); return ctxt->self; } diff --git a/interfaces/innerkits/distributeddata/include/data_query.h b/interfaces/innerkits/distributeddata/include/data_query.h index 5a96f05c6..7eda964b0 100644 --- a/interfaces/innerkits/distributeddata/include/data_query.h +++ b/interfaces/innerkits/distributeddata/include/data_query.h @@ -262,7 +262,7 @@ public: // value: the field value list. // Return: // This Query. - API_EXPORT DataQuery &InInt(const std::string &field, const std::vector &valueList); + API_EXPORT DataQuery &In(const std::string &field, const std::vector &valueList); // In long value list. // Parameters: @@ -270,7 +270,7 @@ public: // value: the field value list. // Return: // This Query. - API_EXPORT DataQuery &InLong(const std::string &field, const std::vector &valueList); + API_EXPORT DataQuery &In(const std::string &field, const std::vector &valueList); // In Double value list. // Parameters: @@ -278,7 +278,7 @@ public: // value: the field value list. // Return: // This Query. - API_EXPORT DataQuery &InDouble(const std::string &field, const std::vector &valueList); + API_EXPORT DataQuery &In(const std::string &field, const std::vector &valueList); // In String value list. // Parameters: @@ -286,7 +286,7 @@ public: // value: the field value list. // Return: // This Query. - API_EXPORT DataQuery &InString(const std::string &field, const std::vector &valueList); + API_EXPORT DataQuery &In(const std::string &field, const std::vector &valueList); // Not in int value list. // Parameters: @@ -294,7 +294,7 @@ public: // value: the field value list. // Return: // This Query. - API_EXPORT DataQuery &NotInInt(const std::string &field, const std::vector &valueList); + API_EXPORT DataQuery &NotIn(const std::string &field, const std::vector &valueList); // Not in long value list. // Parameters: @@ -302,7 +302,7 @@ public: // value: the field value list. // Return: // This Query. - API_EXPORT DataQuery &NotInLong(const std::string &field, const std::vector &valueList); + API_EXPORT DataQuery &NotIn(const std::string &field, const std::vector &valueList); // Not in Double value list. // Parameters: @@ -310,7 +310,7 @@ public: // value: the field value list. // Return: // This Query. - API_EXPORT DataQuery &NotInDouble(const std::string &field, const std::vector &valueList); + API_EXPORT DataQuery &NotIn(const std::string &field, const std::vector &valueList); // Not in String value list. // Parameters: @@ -318,7 +318,7 @@ public: // value: the field value list. // Return: // This Query. - API_EXPORT DataQuery &NotInString(const std::string &field, const std::vector &valueList); + API_EXPORT DataQuery &NotIn(const std::string &field, const std::vector &valueList); // Like String value. // Parameters: -- Gitee