fix case

eldenmoon · Sep 9, 2024 · 57b2bca · 57b2bca
1 parent 9229957
commit 57b2bca
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 52 deletions.
diff --git a/be/src/olap/rowset/segment_v2/segment.cpp b/be/src/olap/rowset/segment_v2/segment.cpp
@@ -1006,10 +1006,7 @@ Status Segment::seek_and_read_by_rowid(const TabletSchema& schema, SlotDescripto
         }
         RETURN_IF_ERROR(
                 iterator_hint->read_by_rowids(single_row_loc.data(), 1, file_storage_column));
-        // iterator_hint.reset(nullptr);
-        // Get it's inner field, for JSONB case
-        vectorized::Field field = remove_nullable(storage_type)->get_default();
-        file_storage_column->get(0, field);
+        vectorized::Field field = storage_type->get_type_field(*file_storage_column, 0);
         result->insert(field);
     } else {
         int index = (slot->col_unique_id() >= 0) ? schema.field_index(slot->col_unique_id())

diff --git a/be/src/vec/columns/column_object.cpp b/be/src/vec/columns/column_object.cpp
@@ -1012,6 +1012,7 @@ void ColumnObject::Subcolumn::get(size_t n, Field& res) const {
             Field new_field;
             convert_field_to_type(res, *least_common_type.get(), &new_field);
             res = new_field;
+            return;
         }
 
         ind -= part->size();

diff --git a/...ore/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java b/...ore/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
@@ -610,10 +610,10 @@ public void validate(ConnectContext ctx) {
             if (distinct.size() != indexes.size()) {
                 throw new AnalysisException("index name must be unique.");
             }
-            // if (distinctCol.size() != indexes.size()) {
-            //     throw new AnalysisException(
-            //             "same index columns have multiple same type index is not allowed.");
-            // }
+            if (distinctCol.size() != indexes.size()) {
+                throw new AnalysisException(
+                        "same index columns have multiple same type index is not allowed.");
+            }
         }
         generatedColumnCheck(ctx);
     }