[fix][store] Remove restrict for empty pb_schema. (dingodb#746)

yuhaijun999 · Dec 6, 2023 · 7962399 · 7962399
1 parent 825e8c4
commit 7962399
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/coprocessor/utils.cc b/src/coprocessor/utils.cc
@@ -70,11 +70,11 @@ void SerialBaseSchemaUpdateKeyWrapper(bool is_key, const UPDATE& update, SERIAL_
 }
 
 butil::Status Utils::CheckPbSchema(const google::protobuf::RepeatedPtrField<pb::store::Schema>& pb_schemas) {
-  if (pb_schemas.empty()) {
-    std::string error_message = fmt::format("pb_schema empty. not support");
-    DINGO_LOG(ERROR) << error_message;
-    return butil::Status(pb::error::EILLEGAL_PARAMTETERS, error_message);
-  }
+  // if (pb_schemas.empty()) {
+  //   std::string error_message = fmt::format("pb_schema empty. not support");
+  //   DINGO_LOG(ERROR) << error_message;
+  //   return butil::Status(pb::error::EILLEGAL_PARAMTETERS, error_message);
+  // }
 
   size_t i = 0;
   for (const auto& schema : pb_schemas) {
@@ -104,11 +104,11 @@ butil::Status Utils::CheckPbSchema(const google::protobuf::RepeatedPtrField<pb::
 
 butil::Status Utils::CheckSerialSchema(
     const std::shared_ptr<std::vector<std::shared_ptr<BaseSchema>>>& serial_schemas) {
-  if (serial_schemas && serial_schemas->empty()) {
-    std::string error_message = fmt::format("serial_schemas empty. not support");
-    DINGO_LOG(ERROR) << error_message;
-    return butil::Status(pb::error::EILLEGAL_PARAMTETERS, error_message);
-  }
+  // if (serial_schemas && serial_schemas->empty()) {
+  //   std::string error_message = fmt::format("serial_schemas empty. not support");
+  //   DINGO_LOG(ERROR) << error_message;
+  //   return butil::Status(pb::error::EILLEGAL_PARAMTETERS, error_message);
+  // }
 
   size_t i = 0;
   for (const auto& schema : *serial_schemas) {

diff --git a/test/test_coprocessor.cc b/test/test_coprocessor.cc
@@ -164,7 +164,7 @@ TEST_F(CoprocessorTest, Open) {
     pb_coprocessor.set_schema_version(1);
 
     ok = coprocessor->Open(pb_coprocessor);
-    EXPECT_EQ(ok.error_code(), pb::error::EILLEGAL_PARAMTETERS);
+    EXPECT_EQ(ok.error_code(), pb::error::Errno::OK);
   }
 
   // selection empty failed
@@ -225,7 +225,7 @@ TEST_F(CoprocessorTest, Open) {
     }
 
     ok = coprocessor->Open(pb_coprocessor);
-    EXPECT_EQ(ok.error_code(), pb::error::EILLEGAL_PARAMTETERS);
+    EXPECT_EQ(ok.error_code(), pb::error::Errno::OK);
   }
 
   // result empty failed
@@ -300,7 +300,7 @@ TEST_F(CoprocessorTest, Open) {
     selection_columns->Add(5);
 
     ok = coprocessor->Open(pb_coprocessor);
-    EXPECT_EQ(ok.error_code(), pb::error::EILLEGAL_PARAMTETERS);
+    EXPECT_EQ(ok.error_code(), pb::error::Errno::OK);
   }
 
   // ok but not exist aggregation

diff --git a/test/test_coprocessor_utils.cc b/test/test_coprocessor_utils.cc
@@ -43,11 +43,11 @@ class CoprocessorUtilsTest : public testing::Test {
 };
 
 TEST_F(CoprocessorUtilsTest, CheckPbSchema) {
-  // empty failed
+  // empty ok
   {
     google::protobuf::RepeatedPtrField<pb::store::Schema> pb_schemas;
     butil::Status ok = Utils::CheckPbSchema(pb_schemas);
-    EXPECT_EQ(ok.error_code(), pb::error::Errno::EILLEGAL_PARAMTETERS);
+    EXPECT_EQ(ok.error_code(), pb::error::Errno::OK);
   }
 
   // type invalid
@@ -60,7 +60,7 @@ TEST_F(CoprocessorUtilsTest, CheckPbSchema) {
     schema1.set_index(0);
     pb_schemas.Add(std::move(schema1));
     butil::Status ok = Utils::CheckPbSchema(pb_schemas);
-    EXPECT_EQ(ok.error_code(), pb::error::Errno::EILLEGAL_PARAMTETERS);
+    EXPECT_EQ(ok.error_code(), pb::error::Errno::OK);
   }
 
   // index invalid
@@ -151,12 +151,12 @@ TEST_F(CoprocessorUtilsTest, CheckPbSchema) {
 }
 
 TEST_F(CoprocessorUtilsTest, CheckSelection) {
-  // empty failed
+  // empty ok
   {
     ::google::protobuf::RepeatedField<int32_t> selection_columns;
     size_t original_schema_size = 10;
     butil::Status ok = Utils::CheckSelection(selection_columns, 10);
-    EXPECT_EQ(ok.error_code(), pb::error::Errno::EILLEGAL_PARAMTETERS);
+    EXPECT_EQ(ok.error_code(), pb::error::Errno::OK);
   }
 
   // index = -1 invalid