Merge branch 'master' into fix-array-nested-struct-query

apache · Nov 3, 2023 · 999c69c · 999c69c
2 parents 4aff848 + 91946dc
commit 999c69c
Show file tree

Hide file tree

Showing 110 changed files with 1,584 additions and 1,244 deletions.
diff --git a/be/src/exec/tablet_info.cpp b/be/src/exec/tablet_info.cpp
@@ -130,15 +130,16 @@ Status OlapTableSchemaParam::init(const POlapTableSchemaParam& pschema) {
     for (auto& col : pschema.partial_update_input_columns()) {
         _partial_update_input_columns.insert(col);
     }
-    std::unordered_map<std::pair<std::string, std::string>, SlotDescriptor*> slots_map;
+    std::unordered_map<std::pair<std::string, FieldType>, SlotDescriptor*> slots_map;
     _tuple_desc = _obj_pool.add(new TupleDescriptor(pschema.tuple_desc()));
 
     for (auto& p_slot_desc : pschema.slot_descs()) {
         auto slot_desc = _obj_pool.add(new SlotDescriptor(p_slot_desc));
         _tuple_desc->add_slot(slot_desc);
         string data_type;
         EnumToString(TPrimitiveType, to_thrift(slot_desc->col_type()), data_type);
-        slots_map.emplace(std::make_pair(to_lower(slot_desc->col_name()), std::move(data_type)),
+        slots_map.emplace(std::make_pair(to_lower(slot_desc->col_name()),
+                                         TabletColumn::get_field_type_by_string(data_type)),
                           slot_desc);
     }
 
@@ -149,8 +150,9 @@ Status OlapTableSchemaParam::init(const POlapTableSchemaParam& pschema) {
         for (auto& pcolumn_desc : p_index.columns_desc()) {
             if (!_is_partial_update ||
                 _partial_update_input_columns.count(pcolumn_desc.name()) > 0) {
-                auto it = slots_map.find(
-                        std::make_pair(to_lower(pcolumn_desc.name()), pcolumn_desc.type()));
+                auto it = slots_map.find(std::make_pair(
+                        to_lower(pcolumn_desc.name()),
+                        TabletColumn::get_field_type_by_string(pcolumn_desc.type())));
                 if (it == std::end(slots_map)) {
                     return Status::InternalError("unknown index column, column={}, type={}",
                                                  pcolumn_desc.name(), pcolumn_desc.type());

diff --git a/be/src/olap/base_tablet.h b/be/src/olap/base_tablet.h
@@ -76,7 +76,8 @@ class BaseTablet {
                                         std::unique_ptr<RowsetWriter>* rowset_writer) = 0;
 
     virtual Status capture_rs_readers(const Version& spec_version,
-                                      std::vector<RowSetSplits>* rs_splits) const = 0;
+                                      std::vector<RowSetSplits>* rs_splits,
+                                      bool skip_missing_version) const = 0;
 
     virtual size_t tablet_footprint() = 0;
 

diff --git a/be/src/olap/delete_bitmap_calculator.h b/be/src/olap/delete_bitmap_calculator.h
@@ -33,7 +33,6 @@
 #include "olap/rowset/rowset.h"
 #include "olap/rowset/rowset_meta.h"
 #include "olap/rowset/rowset_reader.h"
-#include "olap/rowset/rowset_tree.h"
 #include "olap/rowset/segment_v2/segment.h"
 #include "olap/tablet_meta.h"
 #include "olap/tablet_schema.h"

diff --git a/be/src/olap/rowset/rowset_tree.cpp b/be/src/olap/rowset/rowset_tree.cpp