fix ut

Signed-off-by: sevev <[email protected]>
StarRocks · Jun 27, 2024 · 408532d · 408532d
1 parent f338d53
commit 408532d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 321 deletions.
diff --git a/be/test/storage/rowset/flat_json_column_rw_test.cpp b/be/test/storage/rowset/flat_json_column_rw_test.cpp
diff --git a/be/test/storage/rowset/struct_column_rw_test.cpp b/be/test/storage/rowset/struct_column_rw_test.cpp
@@ -168,10 +168,6 @@ class StructColumnRWTest : public testing::Test {
  }
 
  {
-<<<<<<< HEAD
- auto child_path = std::make_unique<ColumnAccessPath>();
- child_path->init(TAccessPathType::type::FIELD, "f1", 0);
-=======
  TabletColumn new_struct_column = create_struct(0, true);
  std::vector<std::string> names{"f1", "f3"};
  TabletColumn f1_tablet_column = create_int_value(1, STORAGE_AGGREGATE_NONE, true);
@@ -253,10 +249,8 @@ class StructColumnRWTest : public testing::Test {
  }
 
  {
- ASSIGN_OR_ABORT(auto child_path, ColumnAccessPath::create(TAccessPathType::type::FIELD, "f1", 0));
- ASSIGN_OR_ABORT(auto path, ColumnAccessPath::create(TAccessPathType::type::ROOT, "root", 0));
- path->children().emplace_back(std::move(child_path));
->>>>>>> 757f14205a ([Feature] Support add/drop field for struct column(part1) (#46451))
+ auto child_path = std::make_unique<ColumnAccessPath>();
+ child_path->init(TAccessPathType::type::FIELD, "f1", 0);
 
  ColumnAccessPath path;
  path.init(TAccessPathType::type::ROOT, "root", 0);