[fix](Row store) get the correct value of row_store_page_size after FE restarts

be/src/olap/rowset/segment_v2/segment_writer.cpp

@@ -258,8 +258,11 @@ Status SegmentWriter::_create_column_writer(uint32_t cid, const TabletColumn& co
 
     if (column.is_row_store_column()) {
         // smaller page size for row store column
-        opts.data_page_size = _tablet_schema->row_store_page_size();
+        auto page_size = _tablet_schema->row_store_page_size();
+        opts.data_page_size =
+                (page_size > 0) ? page_size : segment_v2::ROW_STORE_PAGE_SIZE_DEFAULT_VALUE;
     }
+
     std::unique_ptr<ColumnWriter> writer;
     RETURN_IF_ERROR(ColumnWriter::create(opts, &column, _file_writer, &writer));
     RETURN_IF_ERROR(writer->init());

be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp

@@ -221,8 +221,11 @@ Status VerticalSegmentWriter::_create_column_writer(uint32_t cid, const TabletCo
 
     if (column.is_row_store_column()) {
         // smaller page size for row store column
-        opts.data_page_size = _tablet_schema->row_store_page_size();
+        auto page_size = _tablet_schema->row_store_page_size();
+        opts.data_page_size =
+                (page_size > 0) ? page_size : segment_v2::ROW_STORE_PAGE_SIZE_DEFAULT_VALUE;
     }
+
     std::unique_ptr<ColumnWriter> writer;
     RETURN_IF_ERROR(ColumnWriter::create(opts, &column, _file_writer, &writer));
     RETURN_IF_ERROR(writer->init());

fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java

@@ -670,6 +670,7 @@ public void gsonPostProcess() throws IOException {
         buildEnableLightSchemaChange();
         buildStoreRowColumn();
         buildRowStoreColumns();
+        buildRowStorePageSize();
         buildSkipWriteIndexOnLoad();
         buildCompactionPolicy();
         buildTimeSeriesCompactionGoalSizeMbytes();

fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java

@@ -102,7 +102,7 @@ protected Partition createPartitionWithIndices(long dbId, OlapTable tbl, long pa
                                                    IdGeneratorBuffer idGeneratorBuffer,
                                                    BinlogConfig binlogConfig,
                                                    boolean isStorageMediumSpecified,
-                                                   List<Integer> clusterKeyIndexes, long pageSize)
+                                                   List<Integer> clusterKeyIndexes)
             throws DdlException {
         // create base index first.
         Preconditions.checkArgument(tbl.getBaseIndexId() != -1);

fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java

@@ -97,7 +97,7 @@ public class PropertyAnalyzer {
 
     // row store page size, default 16KB
     public static final String PROPERTIES_ROW_STORE_PAGE_SIZE = "row_store_page_size";
-    public static final long ROW_STORE_PAGE_SIZE_DEFAULT_VALUE = 16384;
+    public static final long ROW_STORE_PAGE_SIZE_DEFAULT_VALUE = 16384L;
 
     public static final String PROPERTIES_ENABLE_LIGHT_SCHEMA_CHANGE = "light_schema_change";
 

fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java

@@ -1710,7 +1710,7 @@ public PartitionPersistInfo addPartition(Database db, String tableName, AddParti
                     singlePartitionDesc.isInMemory(),
                     singlePartitionDesc.getTabletType(),
                     storagePolicy, idGeneratorBuffer,
-                    binlogConfig, dataProperty.isStorageMediumSpecified(), null, olapTable.rowStorePageSize());
+                    binlogConfig, dataProperty.isStorageMediumSpecified(), null);
             // TODO cluster key ids
 
             // check again
@@ -2006,7 +2006,7 @@ protected Partition createPartitionWithIndices(long dbId, OlapTable tbl, long pa
                                                    IdGeneratorBuffer idGeneratorBuffer,
                                                    BinlogConfig binlogConfig,
                                                    boolean isStorageMediumSpecified,
-                                                   List<Integer> clusterKeyIndexes, long rowStorePageSize)
+                                                   List<Integer> clusterKeyIndexes)
             throws DdlException {
         // create base index first.
         Preconditions.checkArgument(tbl.getBaseIndexId() != -1);
@@ -2090,7 +2090,7 @@ protected Partition createPartitionWithIndices(long dbId, OlapTable tbl, long pa
                             tbl.getTimeSeriesCompactionLevelThreshold(),
                             tbl.storeRowColumn(), binlogConfig,
                             tbl.getRowStoreColumnsUniqueIds(rowStoreColumns),
-                            objectPool, rowStorePageSize);
+                            objectPool, tbl.rowStorePageSize());
 
                     task.setStorageFormat(tbl.getStorageFormat());
                     task.setInvertedIndexFileStorageFormat(tbl.getInvertedIndexFileStorageFormat());
@@ -2881,7 +2881,7 @@ private boolean createOlapTable(Database db, CreateTableStmt stmt) throws UserEx
                         idGeneratorBuffer,
                         binlogConfigForTask,
                         partitionInfo.getDataProperty(partitionId).isStorageMediumSpecified(),
-                        keysDesc.getClusterKeysColumnIds(), olapTable.rowStorePageSize());
+                        keysDesc.getClusterKeysColumnIds());
                 afterCreatePartitions(db.getId(), olapTable.getId(), null,
                         olapTable.getIndexIdList(), true);
                 olapTable.addPartition(partition);
@@ -2964,7 +2964,7 @@ private boolean createOlapTable(Database db, CreateTableStmt stmt) throws UserEx
                             partionStoragePolicy, idGeneratorBuffer,
                             binlogConfigForTask,
                             dataProperty.isStorageMediumSpecified(),
-                            keysDesc.getClusterKeysColumnIds(), olapTable.rowStorePageSize());
+                            keysDesc.getClusterKeysColumnIds());
                     olapTable.addPartition(partition);
                     olapTable.getPartitionInfo().getDataProperty(partition.getId())
                             .setStoragePolicy(partionStoragePolicy);
@@ -3431,7 +3431,7 @@ public void truncateTable(TruncateTableStmt truncateTableStmt) throws DdlExcepti
                         olapTable.getPartitionInfo().getDataProperty(oldPartitionId).getStoragePolicy(),
                         idGeneratorBuffer, binlogConfig,
                         copiedTbl.getPartitionInfo().getDataProperty(oldPartitionId).isStorageMediumSpecified(),
-                        clusterKeyIdxes, olapTable.rowStorePageSize());
+                        clusterKeyIdxes);
                 newPartitions.add(newPartition);
             }
 

gensrc/thrift/AgentService.thrift

@@ -47,7 +47,7 @@ struct TTabletSchema {
     19: optional list<i32> cluster_key_idxes
     // col unique id for row store column
     20: optional list<i32> row_store_col_cids
-    21: optional i64 row_store_page_size = 16384;
+    21: optional i64 row_store_page_size = 16384
 }
 
 // this enum stands for different storage format in src_backends

regression-test/data/cloud_p0/row_store_page_size/test_row_store_page_size.out

@@ -0,0 +1,10 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !select_star --
+1	1	1	a
+
+-- !select_star --
+3	3	\N	c
+
+-- !select_star --
+1	1	1	a
+

regression-test/suites/cloud_p0/row_store_page_size/test_row_store_page_size.groovy

@@ -0,0 +1,90 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+import org.codehaus.groovy.runtime.IOGroovyMethods
+
+suite ("test_row_store_page_size_cloud") {
+
+    sql """ DROP TABLE IF EXISTS ps_table_1; """
+
+    sql """
+            create table ps_table_1(
+                k1 int not null,
+                k2 int not null,
+                k3 bigint null,
+                k4 varchar(100) null
+            )
+            unique key (k1,k2)
+            distributed BY hash(k1) buckets 3
+            properties("replication_num" = "1", "store_row_column" = "true");
+        """
+
+    test {
+        sql "show create table ps_table_1;"
+        check { result, exception, startTime, endTime ->
+            assertTrue(result[0][1].contains("\"row_store_page_size\" = \"16384\""))
+        }
+    }
+
+    sql "insert into ps_table_1 select 1,1,1,'a';"
+    sql "insert into ps_table_1 select 2,2,2,'b';"
+    sql "insert into ps_table_1 select 3,3,null,'c';"
+
+    explain {
+        sql("select * from ps_table_1 where k1=1 and k2=1;")
+        contains("SHORT")
+    }
+
+    qt_select_star "select * from ps_table_1 where k1=1 and k2=1;"
+    qt_select_star "select * from ps_table_1 where k1=3 and k2=3;"
+
+    sql """ DROP TABLE IF EXISTS ps_table_1; """
+
+    sql """ DROP TABLE IF EXISTS ps_table_2; """
+
+    sql """
+            create table ps_table_2(
+                k1 int not null,
+                k2 int not null,
+                k3 bigint null,
+                k4 varchar(100) null
+            )
+            unique key (k1,k2)
+            distributed BY hash(k1) buckets 3
+            properties("replication_num" = "1", "store_row_column" = "true", "row_store_page_size" = "8190");
+        """
+
+    test {
+        sql "show create table ps_table_2;"
+        check { result, exception, startTime, endTime ->
+            assertTrue(result[0][1].contains("\"row_store_page_size\" = \"8192\""))
+        }
+    }
+
+    sql "insert into ps_table_2 select 1,1,1,'a';"
+    sql "insert into ps_table_2 select 2,2,2,'b';"
+    sql "insert into ps_table_2 select 3,3,null,'c';"
+
+    explain {
+        sql("select * from ps_table_2 where k1=1 and k2=1;")
+        contains("SHORT")
+    }
+
+    qt_select_star "select * from ps_table_2 where k1=1 and k2=1;"
+
+    sql """ DROP TABLE IF EXISTS ps_table_2; """
+}