[BugFix] Not ignore the leading space when parse delete predicate val…

…ue (StarRocks#39797) Signed-off-by: wyb <wybb86@gmail.com>
willWang8023 · Jan 25, 2024 · e3d5ab0 · e3d5ab0
1 parent d9021a1
commit e3d5ab0
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 4 deletions.
diff --git a/be/src/storage/delete_handler.cpp b/be/src/storage/delete_handler.cpp
@@ -217,12 +217,12 @@ bool DeleteHandler::parse_condition(const std::string& condition_str, TCondition
 
     try {
         // Condition string format
-        // eg:  condition_str="c1 = 1597751948193618247  and length(source)<1;\n;\n"
+        // eg:  condition_str="c1= 1597751948193618247  and length(source)<1;\n;\n"
         //  group1:  ([^\0=<>!\*]{1,64}) matches "c1"
         //  group2:  ((?:=)|(?:!=)|(?:>>)|(?:<<)|(?:>=)|(?:<=)|(?:\*=)|(?:IS)) matches  "="
-        //  group3:  ((?:[\s\S]+)?) matches "1597751948193618247  and length(source)<1;\n;\n"
+        //  group3:  ((?:[\s\S]+)?) matches " 1597751948193618247  and length(source)<1;\n;\n"
         const char* const CONDITION_STR_PATTERN =
-                R"(([^\0=<>!\*]{1,64})\s*((?:=)|(?:!=)|(?:>>)|(?:<<)|(?:>=)|(?:<=)|(?:\*=)|(?: IS ))\s*((?:[\s\S]+)?))";
+                R"(([^\0=<>!\*]{1,64})((?:=)|(?:!=)|(?:>>)|(?:<<)|(?:>=)|(?:<=)|(?:\*=)|(?: IS ))((?:[\s\S]+)?))";
         regex ex(CONDITION_STR_PATTERN);
         if (regex_match(condition_str, what, ex)) {
             if (condition_str.size() != what[0].str().size()) {

diff --git a/be/test/storage/delete_handler_test.cpp b/be/test/storage/delete_handler_test.cpp
@@ -196,6 +196,12 @@ void set_key_columns(TCreateTabletReq* request) {
     k13.__set_is_key(true);
     set_varchar_type(&k13, TPrimitiveType::CHAR, 64);
     request->tablet_schema.columns.push_back(k13);
+
+    TColumn k14;
+    k14.column_name = "k14";
+    k14.__set_is_key(true);
+    set_varchar_type(&k14, TPrimitiveType::VARCHAR, 64);
+    request->tablet_schema.columns.push_back(k14);
 }
 
 void set_default_create_tablet_request(TCreateTabletReq* request) {
@@ -330,24 +336,74 @@ TEST_F(TestDeleteConditionHandler, StoreCondSucceed) {
     condition.condition_values.emplace_back("3");
     conditions.push_back(condition);
 
+    condition.column_name = "k14";
+    condition.condition_op = "=";
+    condition.condition_values.clear();
+    condition.condition_values.emplace_back(" a");
+    conditions.push_back(condition);
+
     DeletePredicatePB del_pred;
     success_res = _delete_condition_handler.generate_delete_predicate(tablet->unsafe_tablet_schema_ref(), conditions,
                                                                       &del_pred);
     ASSERT_EQ(true, success_res.ok());
 
     // Verify that the filter criteria stored in the header are correct
-    ASSERT_EQ(size_t(6), del_pred.sub_predicates_size());
+    ASSERT_EQ(size_t(7), del_pred.sub_predicates_size());
     EXPECT_STREQ("k1=1", del_pred.sub_predicates(0).c_str());
     EXPECT_STREQ("k2>>3", del_pred.sub_predicates(1).c_str());
     EXPECT_STREQ("k3<=5", del_pred.sub_predicates(2).c_str());
     EXPECT_STREQ("k4 IS NULL", del_pred.sub_predicates(3).c_str());
     EXPECT_STREQ("k5=7", del_pred.sub_predicates(4).c_str());
     EXPECT_STREQ("k12!=9", del_pred.sub_predicates(5).c_str());
+    EXPECT_STREQ("k14= a", del_pred.sub_predicates(6).c_str());
 
     ASSERT_EQ(size_t(1), del_pred.in_predicates_size());
     ASSERT_FALSE(del_pred.in_predicates(0).is_not_in());
     EXPECT_STREQ("k13", del_pred.in_predicates(0).column_name().c_str());
     ASSERT_EQ(std::size_t(2), del_pred.in_predicates(0).values().size());
+
+    // Test parse_condition
+    condition.condition_values.clear();
+    ASSERT_TRUE(DeleteHandler::parse_condition(del_pred.sub_predicates(0), &condition));
+    EXPECT_STREQ("k1", condition.column_name.c_str());
+    EXPECT_STREQ("=", condition.condition_op.c_str());
+    EXPECT_STREQ("1", condition.condition_values[0].c_str());
+
+    condition.condition_values.clear();
+    ASSERT_TRUE(DeleteHandler::parse_condition(del_pred.sub_predicates(1), &condition));
+    EXPECT_STREQ("k2", condition.column_name.c_str());
+    EXPECT_STREQ(">>", condition.condition_op.c_str());
+    EXPECT_STREQ("3", condition.condition_values[0].c_str());
+
+    condition.condition_values.clear();
+    ASSERT_TRUE(DeleteHandler::parse_condition(del_pred.sub_predicates(2), &condition));
+    EXPECT_STREQ("k3", condition.column_name.c_str());
+    EXPECT_STREQ("<=", condition.condition_op.c_str());
+    EXPECT_STREQ("5", condition.condition_values[0].c_str());
+
+    condition.condition_values.clear();
+    ASSERT_TRUE(DeleteHandler::parse_condition(del_pred.sub_predicates(3), &condition));
+    EXPECT_STREQ("k4", condition.column_name.c_str());
+    EXPECT_STREQ("IS", condition.condition_op.c_str());
+    EXPECT_STREQ("NULL", condition.condition_values[0].c_str());
+
+    condition.condition_values.clear();
+    ASSERT_TRUE(DeleteHandler::parse_condition(del_pred.sub_predicates(4), &condition));
+    EXPECT_STREQ("k5", condition.column_name.c_str());
+    EXPECT_STREQ("=", condition.condition_op.c_str());
+    EXPECT_STREQ("7", condition.condition_values[0].c_str());
+
+    condition.condition_values.clear();
+    ASSERT_TRUE(DeleteHandler::parse_condition(del_pred.sub_predicates(5), &condition));
+    EXPECT_STREQ("k12", condition.column_name.c_str());
+    EXPECT_STREQ("!=", condition.condition_op.c_str());
+    EXPECT_STREQ("9", condition.condition_values[0].c_str());
+
+    condition.condition_values.clear();
+    ASSERT_TRUE(DeleteHandler::parse_condition(del_pred.sub_predicates(6), &condition));
+    EXPECT_STREQ("k14", condition.column_name.c_str());
+    EXPECT_STREQ("=", condition.condition_op.c_str());
+    EXPECT_STREQ(" a", condition.condition_values[0].c_str());
 }
 
 // empty string