From ecb22ad35e79b0e69810dabdc57911e51babc558 Mon Sep 17 00:00:00 2001 From: lihangyu <15605149486@163.com> Date: Wed, 12 Apr 2023 11:59:56 +0800 Subject: [PATCH] [chore](proto) modify the order of `store_row_column` and `is_dynamic_schema` to be compatible with branch-1.2-lts (#18232) --- be/test/olap/test_data/header_without_inc_rs.txt | 4 ++-- gensrc/proto/olap_file.proto | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 76021315bc..e96b93e8cf 100644 --- a/be/test/olap/test_data/header_without_inc_rs.txt +++ b/be/test/olap/test_data/header_without_inc_rs.txt @@ -57,9 +57,9 @@ "compression_type": "LZ4F", "schema_version": 0, "disable_auto_compaction": false, + "version_col_idx": -1, "store_row_column": false, - "is_dynamic_schema": false, - "version_col_idx": -1 + "is_dynamic_schema": false }, "rs_metas": [ { diff --git a/gensrc/proto/olap_file.proto b/gensrc/proto/olap_file.proto index 03fb1a865c..4d9c05b369 100644 --- a/gensrc/proto/olap_file.proto +++ b/gensrc/proto/olap_file.proto @@ -228,9 +228,9 @@ message TabletSchemaPB { optional int32 schema_version = 14; optional bool disable_auto_compaction = 15 [default=false]; repeated TabletIndexPB index = 16; - optional bool store_row_column = 17 [default=false]; // store tuplerow oriented column - optional bool is_dynamic_schema = 18 [default=false]; - optional int32 version_col_idx = 19 [default = -1]; + optional int32 version_col_idx = 17 [default = -1]; + optional bool store_row_column = 18 [default=false]; // store tuplerow oriented column + optional bool is_dynamic_schema = 19 [default=false]; } enum TabletStatePB {