From a71822a74dfdd8b41983b23924b7bc22867784fa Mon Sep 17 00:00:00 2001
From: Lightman <31928846+Lchangliang@users.noreply.github.com>
Date: Wed, 20 Jul 2022 16:35:14 +0800
Subject: [PATCH] [refactor]remove col_unique_id (#11025)

---
 be/src/olap/tablet_meta.cpp                      |  1 -
 be/src/olap/tablet_schema.cpp                    | 13 ++++---------
 be/src/olap/tablet_schema.h                      |  2 --
 be/test/olap/test_data/header_without_inc_rs.txt |  9 +++------
 gensrc/proto/olap_file.proto                     |  1 -
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/be/src/olap/tablet_meta.cpp b/be/src/olap/tablet_meta.cpp
index eb5669fd4e..ad4d4b104c 100644
--- a/be/src/olap/tablet_meta.cpp
+++ b/be/src/olap/tablet_meta.cpp
@@ -208,7 +208,6 @@ TabletMeta::TabletMeta(const TabletMeta& b)
 void TabletMeta::init_column_from_tcolumn(uint32_t unique_id, const TColumn& tcolumn,
                                           ColumnPB* column) {
     column->set_unique_id(unique_id);
-    column->set_col_unique_id(tcolumn.col_unique_id);
     column->set_name(tcolumn.column_name);
     column->set_has_bitmap_index(tcolumn.has_bitmap_index);
     string data_type;
diff --git a/be/src/olap/tablet_schema.cpp b/be/src/olap/tablet_schema.cpp
index 2dfda1fc07..cc207369ce 100644
--- a/be/src/olap/tablet_schema.cpp
+++ b/be/src/olap/tablet_schema.cpp
@@ -338,15 +338,13 @@ TabletColumn::TabletColumn(const TColumn& column) {
 }
 
 void TabletColumn::init_from_thrift(const TColumn& tcolumn) {
-    _unique_id = tcolumn.col_unique_id;
     ColumnPB column_pb;
-    TabletMeta::init_column_from_tcolumn(_unique_id, tcolumn, &column_pb);
+    TabletMeta::init_column_from_tcolumn(tcolumn.col_unique_id, tcolumn, &column_pb);
     init_from_pb(column_pb);
 }
 
 void TabletColumn::init_from_pb(const ColumnPB& column) {
     _unique_id = column.unique_id();
-    _col_unique_id = column.col_unique_id();
     _col_name = column.name();
     _type = TabletColumn::get_field_type_by_string(column.type());
     _is_key = column.is_key();
@@ -399,7 +397,6 @@ void TabletColumn::init_from_pb(const ColumnPB& column) {
 void TabletColumn::to_schema_pb(ColumnPB* column) const {
     column->set_unique_id(_unique_id);
     column->set_name(_col_name);
-    column->set_col_unique_id(_col_unique_id);
     column->set_type(get_string_by_field_type(_type));
     column->set_is_key(_is_key);
     column->set_is_nullable(_is_nullable);
@@ -470,7 +467,7 @@ void TabletSchema::append_column(TabletColumn column) {
         _num_null_columns++;
     }
     _field_name_to_index[column.name()] = _num_columns;
-    _field_id_to_index[column.col_unique_id()] = _num_columns;
+    _field_id_to_index[column.unique_id()] = _num_columns;
     _cols.push_back(std::move(column));
     _num_columns++;
 }
@@ -501,9 +498,7 @@ void TabletSchema::init_from_pb(const TabletSchemaPB& schema) {
             _num_null_columns++;
         }
         _field_name_to_index[column.name()] = _num_columns;
-        if (column.col_unique_id() >= 0) {
-            _field_id_to_index[column.col_unique_id()] = _num_columns;
-        }
+        _field_id_to_index[column.unique_id()] = _num_columns;
         _cols.emplace_back(std::move(column));
         _num_columns++;
     }
@@ -568,7 +563,7 @@ void TabletSchema::build_current_tablet_schema(int64_t index_id,
                     has_bf_columns = true;
                 }
                 _field_name_to_index[column.name()] = _num_columns;
-                _field_id_to_index[column.col_unique_id()] = _num_columns;
+                _field_id_to_index[column.unique_id()] = _num_columns;
                 _cols.emplace_back(std::move(column));
                 _num_columns++;
             }
diff --git a/be/src/olap/tablet_schema.h b/be/src/olap/tablet_schema.h
index 1ae27b8cb3..4e18012522 100644
--- a/be/src/olap/tablet_schema.h
+++ b/be/src/olap/tablet_schema.h
@@ -48,7 +48,6 @@ public:
     uint32_t mem_size() const;
 
     int32_t unique_id() const { return _unique_id; }
-    int32_t col_unique_id() const { return _col_unique_id; }
     std::string name() const { return _col_name; }
     void set_name(std::string col_name) { _col_name = col_name; }
     FieldType type() const { return _type; }
@@ -120,7 +119,6 @@ private:
     TabletColumn* _parent = nullptr;
     std::vector<TabletColumn> _sub_columns;
     uint32_t _sub_column_count = 0;
-    int32_t _col_unique_id = -1;
 };
 
 bool operator==(const TabletColumn& a, const TabletColumn& b);
diff --git a/be/test/olap/test_data/header_without_inc_rs.txt b/be/test/olap/test_data/header_without_inc_rs.txt
index 35cde8c238..d927865fae 100644
--- a/be/test/olap/test_data/header_without_inc_rs.txt
+++ b/be/test/olap/test_data/header_without_inc_rs.txt
@@ -19,8 +19,7 @@
                 "is_nullable": false,
                 "length": 8,
                 "index_length": 8,
-                "visible": true,
-                "col_unique_id": -1
+                "visible": true
             },
             {
                 "unique_id": 1,
@@ -32,8 +31,7 @@
                 "default_value": "MA==",
                 "length": 16387,
                 "index_length": 16,
-                "visible": true,
-                "col_unique_id": -1
+                "visible": true
             },
             {
                 "unique_id": 2,
@@ -44,8 +42,7 @@
                 "is_nullable": false,
                 "length": 4,
                 "index_length": 4,
-                "visible": true,
-                "col_unique_id": -1
+                "visible": true
             }
         ],
         "num_short_key_columns": 1,
diff --git a/gensrc/proto/olap_file.proto b/gensrc/proto/olap_file.proto
index aafd94ef99..c1ecfac30d 100644
--- a/gensrc/proto/olap_file.proto
+++ b/gensrc/proto/olap_file.proto
@@ -192,7 +192,6 @@ message ColumnPB {
     optional bool visible = 16 [default=true];
     repeated ColumnPB children_columns = 17;
     repeated string children_column_names = 18;
-    optional int32 col_unique_id = 19 [default=-1]; // default is important
 }
 
 enum SortType {