This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new dcf3785dfb1 Revert "[opt](store) allow to set storage_page_size for
tables (#43690)" (#44246)
dcf3785dfb1 is described below
commit dcf3785dfb107630b66d933348adb377c10dfbde
Author: zzzxl <[email protected]>
AuthorDate: Tue Nov 19 23:35:15 2024 +0800
Revert "[opt](store) allow to set storage_page_size for tables (#43690)"
(#44246)
Reverts apache/doris#43918
---
be/src/cloud/pb_convert.cpp | 4 -
be/src/olap/rowset/segment_v2/options.h | 1 -
be/src/olap/rowset/segment_v2/segment_writer.cpp | 27 ---
.../rowset/segment_v2/vertical_segment_writer.cpp | 27 ---
be/src/olap/tablet_meta.cpp | 3 -
be/src/olap/tablet_schema.cpp | 4 -
be/src/olap/tablet_schema.h | 3 -
.../org/apache/doris/alter/CloudRollupJobV2.java | 3 +-
.../apache/doris/alter/CloudSchemaChangeJobV2.java | 3 +-
.../java/org/apache/doris/alter/RollupJobV2.java | 3 +-
.../org/apache/doris/alter/SchemaChangeJobV2.java | 3 +-
.../analysis/ModifyTablePropertiesClause.java | 2 -
.../java/org/apache/doris/backup/RestoreJob.java | 3 +-
.../main/java/org/apache/doris/catalog/Env.java | 6 -
.../java/org/apache/doris/catalog/OlapTable.java | 14 --
.../org/apache/doris/catalog/TableProperty.java | 13 --
.../cloud/datasource/CloudInternalCatalog.java | 7 +-
.../apache/doris/common/util/PropertyAnalyzer.java | 21 ---
.../apache/doris/datasource/InternalCatalog.java | 15 +-
.../org/apache/doris/master/ReportHandler.java | 3 +-
.../org/apache/doris/task/CreateReplicaTask.java | 6 +-
.../apache/doris/common/PropertyAnalyzerTest.java | 48 ------
.../java/org/apache/doris/task/AgentTaskTest.java | 4 +-
gensrc/proto/olap_file.proto | 3 -
gensrc/thrift/AgentService.thrift | 1 -
.../data/query_p0/system/test_table_properties.out | 8 +-
.../test_storage_page_size_fault.groovy | 71 --------
.../query_p0/system/test_storage_page_size.groovy | 190 ---------------------
28 files changed, 12 insertions(+), 484 deletions(-)
diff --git a/be/src/cloud/pb_convert.cpp b/be/src/cloud/pb_convert.cpp
index 2c51e97dd57..c65d3208be4 100644
--- a/be/src/cloud/pb_convert.cpp
+++ b/be/src/cloud/pb_convert.cpp
@@ -329,7 +329,6 @@ void doris_tablet_schema_to_cloud(TabletSchemaCloudPB* out,
const TabletSchemaPB
out->mutable_row_store_column_unique_ids()->CopyFrom(in.row_store_column_unique_ids());
out->set_inverted_index_storage_format(in.inverted_index_storage_format());
out->set_enable_variant_flatten_nested(in.variant_enable_flatten_nested());
- out->set_storage_page_size(in.storage_page_size());
}
void doris_tablet_schema_to_cloud(TabletSchemaCloudPB* out, TabletSchemaPB&&
in) {
@@ -357,7 +356,6 @@ void doris_tablet_schema_to_cloud(TabletSchemaCloudPB* out,
TabletSchemaPB&& in)
out->mutable_row_store_column_unique_ids()->Swap(in.mutable_row_store_column_unique_ids());
out->set_inverted_index_storage_format(in.inverted_index_storage_format());
out->set_enable_variant_flatten_nested(in.variant_enable_flatten_nested());
- out->set_storage_page_size(in.storage_page_size());
}
TabletSchemaPB cloud_tablet_schema_to_doris(const TabletSchemaCloudPB& in) {
@@ -398,7 +396,6 @@ void cloud_tablet_schema_to_doris(TabletSchemaPB* out,
const TabletSchemaCloudPB
out->mutable_row_store_column_unique_ids()->CopyFrom(in.row_store_column_unique_ids());
out->set_inverted_index_storage_format(in.inverted_index_storage_format());
out->set_variant_enable_flatten_nested(in.enable_variant_flatten_nested());
- out->set_storage_page_size(in.storage_page_size());
}
void cloud_tablet_schema_to_doris(TabletSchemaPB* out, TabletSchemaCloudPB&&
in) {
@@ -427,7 +424,6 @@ void cloud_tablet_schema_to_doris(TabletSchemaPB* out,
TabletSchemaCloudPB&& in)
out->mutable_row_store_column_unique_ids()->Swap(in.mutable_row_store_column_unique_ids());
out->set_inverted_index_storage_format(in.inverted_index_storage_format());
out->set_variant_enable_flatten_nested(in.enable_variant_flatten_nested());
- out->set_storage_page_size(in.storage_page_size());
}
TabletMetaCloudPB doris_tablet_meta_to_cloud(const TabletMetaPB& in) {
diff --git a/be/src/olap/rowset/segment_v2/options.h
b/be/src/olap/rowset/segment_v2/options.h
index 164a8a27fc1..93ec03df452 100644
--- a/be/src/olap/rowset/segment_v2/options.h
+++ b/be/src/olap/rowset/segment_v2/options.h
@@ -23,7 +23,6 @@ namespace doris {
namespace segment_v2 {
static constexpr size_t DEFAULT_PAGE_SIZE = 1024 * 1024; // default size: 1M
-static constexpr size_t STORAGE_PAGE_SIZE_DEFAULT_VALUE = 65536;
constexpr long ROW_STORE_PAGE_SIZE_DEFAULT_VALUE = 16384; // default row store
page size: 16KB
diff --git a/be/src/olap/rowset/segment_v2/segment_writer.cpp
b/be/src/olap/rowset/segment_v2/segment_writer.cpp
index 3d192dee6e9..0db06c2de74 100644
--- a/be/src/olap/rowset/segment_v2/segment_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/segment_writer.cpp
@@ -247,33 +247,6 @@ Status SegmentWriter::_create_column_writer(uint32_t cid,
const TabletColumn& co
#undef DISABLE_INDEX_IF_FIELD_TYPE
- int64_t storage_page_size = _tablet_schema->storage_page_size();
- // storage_page_size must be between 4KB and 10MB.
- if (storage_page_size >= 4096 && storage_page_size <= 10485760) {
- opts.data_page_size = storage_page_size;
- }
-
DBUG_EXECUTE_IF("VerticalSegmentWriter._create_column_writer.storage_page_size",
{
- auto table_id =
DebugPoints::instance()->get_debug_param_or_default<int32_t>(
-
"VerticalSegmentWriter._create_column_writer.storage_page_size", "table_id",
- INT_MIN);
- auto target_data_page_size =
DebugPoints::instance()->get_debug_param_or_default<int32_t>(
-
"VerticalSegmentWriter._create_column_writer.storage_page_size",
- "storage_page_size", INT_MIN);
- if (table_id == INT_MIN || target_data_page_size == INT_MIN) {
- return Status::Error<ErrorCode::INTERNAL_ERROR>(
- "Debug point parameters missing: either 'table_id' or
'storage_page_size' not "
- "set.");
- }
- if (table_id == _tablet_schema->table_id() &&
- opts.data_page_size != target_data_page_size) {
- return Status::Error<ErrorCode::INTERNAL_ERROR>(
- "Mismatch in 'storage_page_size': expected size does not
match the current "
- "data page size. "
- "Expected: " +
- std::to_string(target_data_page_size) +
- ", Actual: " + std::to_string(opts.data_page_size) + ".");
- }
- })
if (column.is_row_store_column()) {
// smaller page size for row store column
auto page_size = _tablet_schema->row_store_page_size();
diff --git a/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp
b/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp
index a84095fa4ef..857f6b2f3c7 100644
--- a/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp
@@ -240,33 +240,6 @@ Status
VerticalSegmentWriter::_create_column_writer(uint32_t cid, const TabletCo
#undef CHECK_FIELD_TYPE
- int64_t storage_page_size = _tablet_schema->storage_page_size();
- // storage_page_size must be between 4KB and 10MB.
- if (storage_page_size >= 4096 && storage_page_size <= 10485760) {
- opts.data_page_size = storage_page_size;
- }
-
DBUG_EXECUTE_IF("VerticalSegmentWriter._create_column_writer.storage_page_size",
{
- auto table_id =
DebugPoints::instance()->get_debug_param_or_default<int32_t>(
-
"VerticalSegmentWriter._create_column_writer.storage_page_size", "table_id",
- INT_MIN);
- auto target_data_page_size =
DebugPoints::instance()->get_debug_param_or_default<int32_t>(
-
"VerticalSegmentWriter._create_column_writer.storage_page_size",
- "storage_page_size", INT_MIN);
- if (table_id == INT_MIN || target_data_page_size == INT_MIN) {
- return Status::Error<ErrorCode::INTERNAL_ERROR>(
- "Debug point parameters missing: either 'table_id' or
'storage_page_size' not "
- "set.");
- }
- if (table_id == _tablet_schema->table_id() &&
- opts.data_page_size != target_data_page_size) {
- return Status::Error<ErrorCode::INTERNAL_ERROR>(
- "Mismatch in 'storage_page_size': expected size does not
match the current "
- "data page size. "
- "Expected: " +
- std::to_string(target_data_page_size) +
- ", Actual: " + std::to_string(opts.data_page_size) + ".");
- }
- })
if (column.is_row_store_column()) {
// smaller page size for row store column
auto page_size = _tablet_schema->row_store_page_size();
diff --git a/be/src/olap/tablet_meta.cpp b/be/src/olap/tablet_meta.cpp
index 3b02fd972e3..3afafd6ba4a 100644
--- a/be/src/olap/tablet_meta.cpp
+++ b/be/src/olap/tablet_meta.cpp
@@ -329,9 +329,6 @@ TabletMeta::TabletMeta(int64_t table_id, int64_t
partition_id, int64_t tablet_id
if (tablet_schema.__isset.row_store_page_size) {
schema->set_row_store_page_size(tablet_schema.row_store_page_size);
}
- if (tablet_schema.__isset.storage_page_size) {
- schema->set_storage_page_size(tablet_schema.storage_page_size);
- }
if (tablet_schema.__isset.skip_write_index_on_load) {
schema->set_skip_write_index_on_load(tablet_schema.skip_write_index_on_load);
}
diff --git a/be/src/olap/tablet_schema.cpp b/be/src/olap/tablet_schema.cpp
index d9f96e901fc..011a701b865 100644
--- a/be/src/olap/tablet_schema.cpp
+++ b/be/src/olap/tablet_schema.cpp
@@ -1038,7 +1038,6 @@ void TabletSchema::init_from_pb(const TabletSchemaPB&
schema, bool ignore_extrac
_sort_col_num = schema.sort_col_num();
_compression_type = schema.compression_type();
_row_store_page_size = schema.row_store_page_size();
- _storage_page_size = schema.storage_page_size();
_schema_version = schema.schema_version();
// Default to V1 inverted index storage format for backward compatibility
if not specified in schema.
if (!schema.has_inverted_index_storage_format()) {
@@ -1101,7 +1100,6 @@ void TabletSchema::build_current_tablet_schema(int64_t
index_id, int32_t version
_sort_type = ori_tablet_schema.sort_type();
_sort_col_num = ori_tablet_schema.sort_col_num();
_row_store_page_size = ori_tablet_schema.row_store_page_size();
- _storage_page_size = ori_tablet_schema.storage_page_size();
_variant_enable_flatten_nested =
ori_tablet_schema.variant_flatten_nested();
// copy from table_schema_param
@@ -1258,7 +1256,6 @@ void TabletSchema::to_schema_pb(TabletSchemaPB*
tablet_schema_pb) const {
tablet_schema_pb->set_schema_version(_schema_version);
tablet_schema_pb->set_compression_type(_compression_type);
tablet_schema_pb->set_row_store_page_size(_row_store_page_size);
- tablet_schema_pb->set_storage_page_size(_storage_page_size);
tablet_schema_pb->set_version_col_idx(_version_col_idx);
tablet_schema_pb->set_inverted_index_storage_format(_inverted_index_storage_format);
tablet_schema_pb->mutable_row_store_column_unique_ids()->Assign(
@@ -1525,7 +1522,6 @@ bool operator==(const TabletSchema& a, const
TabletSchema& b) {
if (a._enable_single_replica_compaction !=
b._enable_single_replica_compaction) return false;
if (a._store_row_column != b._store_row_column) return false;
if (a._row_store_page_size != b._row_store_page_size) return false;
- if (a._storage_page_size != b._storage_page_size) return false;
if (a._skip_write_index_on_load != b._skip_write_index_on_load) return
false;
if (a._variant_enable_flatten_nested != b._variant_enable_flatten_nested)
return false;
return true;
diff --git a/be/src/olap/tablet_schema.h b/be/src/olap/tablet_schema.h
index 44dc21a9239..8e8edf16953 100644
--- a/be/src/olap/tablet_schema.h
+++ b/be/src/olap/tablet_schema.h
@@ -390,8 +390,6 @@ public:
segment_v2::CompressionTypePB compression_type() const { return
_compression_type; }
void set_row_store_page_size(long page_size) { _row_store_page_size =
page_size; }
long row_store_page_size() const { return _row_store_page_size; }
- void set_storage_page_size(long storage_page_size) { _storage_page_size =
storage_page_size; }
- long storage_page_size() const { return _storage_page_size; }
const std::vector<const TabletIndex*> inverted_indexes() const {
std::vector<const TabletIndex*> inverted_indexes;
@@ -551,7 +549,6 @@ private:
CompressKind _compress_kind = COMPRESS_NONE;
segment_v2::CompressionTypePB _compression_type =
segment_v2::CompressionTypePB::LZ4F;
long _row_store_page_size = segment_v2::ROW_STORE_PAGE_SIZE_DEFAULT_VALUE;
- long _storage_page_size = segment_v2::STORAGE_PAGE_SIZE_DEFAULT_VALUE;
size_t _next_column_unique_id = 0;
std::string _auto_increment_column;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java
index 7873632f468..0fc53f09d11 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java
@@ -232,8 +232,7 @@ public class CloudRollupJobV2 extends RollupJobV2 {
tbl.getRowStoreColumnsUniqueIds(rowStoreColumns),
tbl.getEnableMowLightDelete(), null,
tbl.rowStorePageSize(),
- tbl.variantEnableFlattenNested(),
- tbl.storagePageSize());
+ tbl.variantEnableFlattenNested());
requestBuilder.addTabletMetas(builder);
} // end for rollupTablets
requestBuilder.setDbId(dbId);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java
index 4e5ba45e8f2..5ddc466615e 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java
@@ -273,8 +273,7 @@ public class CloudSchemaChangeJobV2 extends
SchemaChangeJobV2 {
tbl.getEnableMowLightDelete(),
tbl.getInvertedIndexFileStorageFormat(),
tbl.rowStorePageSize(),
- tbl.variantEnableFlattenNested(),
- tbl.storagePageSize());
+ tbl.variantEnableFlattenNested());
requestBuilder.addTabletMetas(builder);
} // end for rollupTablets
requestBuilder.setDbId(dbId);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
index c84c1e2a4c0..1ff74d4cb81 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
@@ -270,8 +270,7 @@ public class RollupJobV2 extends AlterJobV2 implements
GsonPostProcessable {
tbl.getRowStoreColumnsUniqueIds(tbl.getTableProperty().getCopiedRowStoreColumns()),
objectPool,
tbl.rowStorePageSize(),
- tbl.variantEnableFlattenNested(),
- tbl.storagePageSize());
+ tbl.variantEnableFlattenNested());
createReplicaTask.setBaseTablet(tabletIdMap.get(rollupTabletId),
baseSchemaHash);
if (this.storageFormat != null) {
createReplicaTask.setStorageFormat(this.storageFormat);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
index 872686dac3d..9ece02c876a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
@@ -319,8 +319,7 @@ public class SchemaChangeJobV2 extends AlterJobV2 {
tbl.getRowStoreColumnsUniqueIds(rowStoreColumns),
objectPool,
tbl.rowStorePageSize(),
- tbl.variantEnableFlattenNested(),
- tbl.storagePageSize());
+ tbl.variantEnableFlattenNested());
createReplicaTask.setBaseTablet(partitionIndexTabletMap.get(partitionId,
shadowIdxId)
.get(shadowTabletId), originSchemaHash);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java
index a12b1a9a49a..2d3bc4ae05f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java
@@ -364,8 +364,6 @@ public class ModifyTablePropertiesClause extends
AlterTableClause {
}
this.needTableStable = false;
this.opType = AlterOpType.MODIFY_TABLE_PROPERTY_SYNC;
- } else if
(properties.containsKey(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE)) {
- throw new AnalysisException("You can not modify
storage_page_size");
} else {
throw new AnalysisException("Unknown table property: " +
properties.keySet());
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
index 595f0e899c7..e922955c5aa 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
@@ -1353,8 +1353,7 @@ public class RestoreJob extends AbstractJob implements
GsonPostProcessable {
localTbl.getRowStoreColumnsUniqueIds(rowStoreColumns),
objectPool,
localTbl.rowStorePageSize(),
- localTbl.variantEnableFlattenNested(),
- localTbl.storagePageSize());
+ localTbl.variantEnableFlattenNested());
task.setInvertedIndexFileStorageFormat(localTbl.getInvertedIndexFileStorageFormat());
task.setInRestoreMode(true);
if (baseTabletRef != null) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
index 131b6682af2..e4272472587 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -3631,12 +3631,6 @@ public class Env {
sb.append(olapTable.rowStorePageSize()).append("\"");
}
- // storage page size
- if (olapTable.storagePageSize() !=
PropertyAnalyzer.STORAGE_PAGE_SIZE_DEFAULT_VALUE) {
-
sb.append(",\n\"").append(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE).append("\"
= \"");
- sb.append(olapTable.storagePageSize()).append("\"");
- }
-
// skip inverted index on load
if (olapTable.skipWriteIndexOnLoad()) {
sb.append(",\n\"").append(PropertyAnalyzer.PROPERTIES_SKIP_WRITE_INDEX_ON_LOAD).append("\"
= \"");
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
index ab587684907..2f0610619be 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -2656,20 +2656,6 @@ public class OlapTable extends Table implements
MTMVRelatedTableIf, GsonPostProc
return PropertyAnalyzer.ROW_STORE_PAGE_SIZE_DEFAULT_VALUE;
}
- public void setStoragePageSize(long storagePageSize) {
- TableProperty tableProperty = getOrCreatTableProperty();
-
tableProperty.modifyTableProperties(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE,
- Long.valueOf(storagePageSize).toString());
- tableProperty.buildStoragePageSize();
- }
-
- public long storagePageSize() {
- if (tableProperty != null) {
- return tableProperty.storagePageSize();
- }
- return PropertyAnalyzer.STORAGE_PAGE_SIZE_DEFAULT_VALUE;
- }
-
public void setStorageFormat(TStorageFormat storageFormat) {
TableProperty tableProperty = getOrCreatTableProperty();
tableProperty.modifyTableProperties(PropertyAnalyzer.PROPERTIES_STORAGE_FORMAT,
storageFormat.name());
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java
index f8d84f885a3..1c1d7e35880 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java
@@ -107,8 +107,6 @@ public class TableProperty implements Writable,
GsonPostProcessable {
private long rowStorePageSize =
PropertyAnalyzer.ROW_STORE_PAGE_SIZE_DEFAULT_VALUE;
- private long storagePageSize =
PropertyAnalyzer.STORAGE_PAGE_SIZE_DEFAULT_VALUE;
-
private String compactionPolicy =
PropertyAnalyzer.SIZE_BASED_COMPACTION_POLICY;
private long timeSeriesCompactionGoalSizeMbytes
@@ -326,17 +324,6 @@ public class TableProperty implements Writable,
GsonPostProcessable {
return rowStorePageSize;
}
- public TableProperty buildStoragePageSize() {
- storagePageSize = Long.parseLong(
-
properties.getOrDefault(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE,
-
Long.toString(PropertyAnalyzer.STORAGE_PAGE_SIZE_DEFAULT_VALUE)));
- return this;
- }
-
- public long storagePageSize() {
- return storagePageSize;
- }
-
public TableProperty buildSkipWriteIndexOnLoad() {
skipWriteIndexOnLoad = Boolean.parseBoolean(
properties.getOrDefault(PropertyAnalyzer.PROPERTIES_SKIP_WRITE_INDEX_ON_LOAD,
"false"));
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java
index e0eb411d8e6..c20d971cc30 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java
@@ -174,8 +174,7 @@ public class CloudInternalCatalog extends InternalCatalog {
tbl.getEnableMowLightDelete(),
tbl.getInvertedIndexFileStorageFormat(),
tbl.rowStorePageSize(),
- tbl.variantEnableFlattenNested(),
- tbl.storagePageSize());
+ tbl.variantEnableFlattenNested());
requestBuilder.addTabletMetas(builder);
}
if (!storageVaultIdSet && ((CloudEnv)
Env.getCurrentEnv()).getEnableStorageVault()) {
@@ -225,8 +224,7 @@ public class CloudInternalCatalog extends InternalCatalog {
Long timeSeriesCompactionLevelThreshold, boolean
disableAutoCompaction,
List<Integer> rowStoreColumnUniqueIds, boolean
enableMowLightDelete,
TInvertedIndexFileStorageFormat invertedIndexFileStorageFormat,
long pageSize,
- boolean variantEnableFlattenNested,
- long storagePageSize) throws DdlException {
+ boolean variantEnableFlattenNested) throws DdlException {
OlapFile.TabletMetaCloudPB.Builder builder =
OlapFile.TabletMetaCloudPB.newBuilder();
builder.setTableId(tableId);
builder.setIndexId(indexId);
@@ -353,7 +351,6 @@ public class CloudInternalCatalog extends InternalCatalog {
}
}
schemaBuilder.setRowStorePageSize(pageSize);
- schemaBuilder.setStoragePageSize(storagePageSize);
schemaBuilder.setEnableVariantFlattenNested(variantEnableFlattenNested);
OlapFile.TabletSchemaCloudPB schema = schemaBuilder.build();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
index 8189f3844ac..a34827303ec 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
@@ -100,9 +100,6 @@ public class PropertyAnalyzer {
public static final String PROPERTIES_ROW_STORE_PAGE_SIZE =
"row_store_page_size";
public static final long ROW_STORE_PAGE_SIZE_DEFAULT_VALUE = 16384L;
- public static final String PROPERTIES_STORAGE_PAGE_SIZE =
"storage_page_size";
- public static final long STORAGE_PAGE_SIZE_DEFAULT_VALUE = 65536L;
-
public static final String PROPERTIES_ENABLE_LIGHT_SCHEMA_CHANGE =
"light_schema_change";
public static final String PROPERTIES_DISTRIBUTION_TYPE =
"distribution_type";
@@ -1078,24 +1075,6 @@ public class PropertyAnalyzer {
return rowStorePageSize;
}
- public static long analyzeStoragePageSize(Map<String, String> properties)
throws AnalysisException {
- long storagePageSize = STORAGE_PAGE_SIZE_DEFAULT_VALUE;
- if (properties != null &&
properties.containsKey(PROPERTIES_STORAGE_PAGE_SIZE)) {
- String storagePageSizeStr =
properties.get(PROPERTIES_STORAGE_PAGE_SIZE);
- try {
- storagePageSize = Long.parseLong(storagePageSizeStr);
- } catch (NumberFormatException e) {
- throw new AnalysisException("Invalid storage page size: " +
storagePageSizeStr);
- }
- if (storagePageSize < 4096 || storagePageSize > 10485760) {
- throw new AnalysisException("Storage page size must be between
4KB and 10MB.");
- }
- storagePageSize = alignTo4K(storagePageSize);
- properties.remove(PROPERTIES_STORAGE_PAGE_SIZE);
- }
- return storagePageSize;
- }
-
// analyzeStorageFormat will parse the storage format from properties
// sql: alter table tablet_name set ("storage_format" = "v2")
// Use this sql to convert all tablets(base and rollup index) to a new
format segment
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
index ad10dec485e..a673ca6e4c5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
@@ -1641,10 +1641,6 @@ public class InternalCatalog implements
CatalogIf<Database> {
properties.put(PropertyAnalyzer.PROPERTIES_ROW_STORE_PAGE_SIZE,
Long.toString(olapTable.rowStorePageSize()));
}
- if
(!properties.containsKey(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE)) {
- properties.put(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE,
- Long.toString(olapTable.storagePageSize()));
- }
if
(!properties.containsKey(PropertyAnalyzer.PROPERTIES_SKIP_WRITE_INDEX_ON_LOAD))
{
properties.put(PropertyAnalyzer.PROPERTIES_SKIP_WRITE_INDEX_ON_LOAD,
olapTable.skipWriteIndexOnLoad().toString());
@@ -2172,8 +2168,7 @@ public class InternalCatalog implements
CatalogIf<Database> {
tbl.storeRowColumn(), binlogConfig,
tbl.getRowStoreColumnsUniqueIds(rowStoreColumns),
objectPool, tbl.rowStorePageSize(),
- tbl.variantEnableFlattenNested(),
- tbl.storagePageSize());
+ tbl.variantEnableFlattenNested());
task.setStorageFormat(tbl.getStorageFormat());
task.setInvertedIndexFileStorageFormat(tbl.getInvertedIndexFileStorageFormat());
@@ -2663,14 +2658,6 @@ public class InternalCatalog implements
CatalogIf<Database> {
olapTable.setRowStorePageSize(rowStorePageSize);
- long storagePageSize =
PropertyAnalyzer.STORAGE_PAGE_SIZE_DEFAULT_VALUE;
- try {
- storagePageSize =
PropertyAnalyzer.analyzeStoragePageSize(properties);
- } catch (AnalysisException e) {
- throw new DdlException(e.getMessage());
- }
- olapTable.setStoragePageSize(storagePageSize);
-
// check data sort properties
int keyColumnSize =
CollectionUtils.isEmpty(keysDesc.getClusterKeysColumnNames()) ?
keysDesc.keysColumnSize() :
keysDesc.getClusterKeysColumnNames().size();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
index c5c72eae3c5..bc51590ccb5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
@@ -974,8 +974,7 @@ public class ReportHandler extends Daemon {
olapTable.getRowStoreColumnsUniqueIds(rowStoreColumns),
objectPool,
olapTable.rowStorePageSize(),
-
olapTable.variantEnableFlattenNested(),
- olapTable.storagePageSize());
+
olapTable.variantEnableFlattenNested());
createReplicaTask.setIsRecoverTask(true);
createReplicaTask.setInvertedIndexFileStorageFormat(olapTable
.getInvertedIndexFileStorageFormat());
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/task/CreateReplicaTask.java
b/fe/fe-core/src/main/java/org/apache/doris/task/CreateReplicaTask.java
index 94b73ef2864..c410f37e5c9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/CreateReplicaTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/CreateReplicaTask.java
@@ -66,7 +66,6 @@ public class CreateReplicaTask extends AgentTask {
private TStorageMedium storageMedium;
private TCompressionType compressionType;
private long rowStorePageSize;
- private long storagePageSize;
private List<Column> columns;
@@ -157,8 +156,7 @@ public class CreateReplicaTask extends AgentTask {
List<Integer> rowStoreColumnUniqueIds,
Map<Object, Object> objectPool,
long rowStorePageSize,
- boolean variantEnableFlattenNested,
- long storagePageSize) {
+ boolean variantEnableFlattenNested) {
super(null, backendId, TTaskType.CREATE, dbId, tableId, partitionId,
indexId, tabletId);
this.replicaId = replicaId;
@@ -206,7 +204,6 @@ public class CreateReplicaTask extends AgentTask {
this.objectPool = objectPool;
this.rowStorePageSize = rowStorePageSize;
this.variantEnableFlattenNested = variantEnableFlattenNested;
- this.storagePageSize = storagePageSize;
}
public void setIsRecoverTask(boolean isRecoverTask) {
@@ -368,7 +365,6 @@ public class CreateReplicaTask extends AgentTask {
tSchema.setSkipWriteIndexOnLoad(skipWriteIndexOnLoad);
tSchema.setStoreRowColumn(storeRowColumn);
tSchema.setRowStorePageSize(rowStorePageSize);
- tSchema.setStoragePageSize(storagePageSize);
createTabletReq.setTabletSchema(tSchema);
createTabletReq.setVersion(version);
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/common/PropertyAnalyzerTest.java
b/fe/fe-core/src/test/java/org/apache/doris/common/PropertyAnalyzerTest.java
index 041ca89bfc5..eb3500d13d9 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/common/PropertyAnalyzerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/common/PropertyAnalyzerTest.java
@@ -188,52 +188,4 @@ public class PropertyAnalyzerTest {
Assert.assertEquals(1, tagMap.size());
Assert.assertEquals(Tag.DEFAULT_BACKEND_TAG.value,
tagMap.get(Tag.TYPE_LOCATION));
}
-
- @Test
- public void testStoragePageSize() throws AnalysisException {
- Map<String, String> properties = Maps.newHashMap();
-
- // Test default value
- Assert.assertEquals(PropertyAnalyzer.STORAGE_PAGE_SIZE_DEFAULT_VALUE,
- PropertyAnalyzer.analyzeStoragePageSize(properties));
-
- // Test valid value
- properties.put(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE, "8192");
// 8KB
- Assert.assertEquals(8192,
PropertyAnalyzer.analyzeStoragePageSize(properties));
-
- // Test lower boundary value
- properties.put(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE, "4096");
// 4KB
- Assert.assertEquals(4096,
PropertyAnalyzer.analyzeStoragePageSize(properties));
-
- // Test upper boundary value
- properties.put(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE,
"10485760"); // 10MB
- Assert.assertEquals(10485760,
PropertyAnalyzer.analyzeStoragePageSize(properties));
-
- // Test invalid number format
- properties.put(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE,
"invalid");
- try {
- PropertyAnalyzer.analyzeStoragePageSize(properties);
- Assert.fail("Expected an AnalysisException to be thrown");
- } catch (AnalysisException e) {
- Assert.assertTrue(e.getMessage().contains("Invalid storage page
size"));
- }
-
- // Test value below minimum limit
- properties.put(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE, "1024");
// 1KB
- try {
- PropertyAnalyzer.analyzeStoragePageSize(properties);
- Assert.fail("Expected an AnalysisException to be thrown");
- } catch (AnalysisException e) {
- Assert.assertTrue(e.getMessage().contains("Storage page size must
be between 4KB and 10MB"));
- }
-
- // Test value above maximum limit
- properties.put(PropertyAnalyzer.PROPERTIES_STORAGE_PAGE_SIZE,
"20971520"); // 20MB
- try {
- PropertyAnalyzer.analyzeStoragePageSize(properties);
- Assert.fail("Expected an AnalysisException to be thrown");
- } catch (AnalysisException e) {
- Assert.assertTrue(e.getMessage().contains("Storage page size must
be between 4KB and 10MB"));
- }
- }
}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/task/AgentTaskTest.java
b/fe/fe-core/src/test/java/org/apache/doris/task/AgentTaskTest.java
index f6c6201a934..6f2996207d0 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/task/AgentTaskTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/task/AgentTaskTest.java
@@ -74,7 +74,6 @@ public class AgentTaskTest {
private TStorageType storageType = TStorageType.COLUMN;
private long rowStorePageSize = 16384L;
- private long storagePageSize = 65536L;
private List<Column> columns;
private MarkedCountDownLatch<Long, Long> latch = new
MarkedCountDownLatch<Long, Long>(3);
@@ -109,8 +108,7 @@ public class AgentTaskTest {
createReplicaTask = new CreateReplicaTask(backendId1, dbId, tableId,
partitionId,
indexId1, tabletId1, replicaId1, shortKeyNum, schemaHash1,
version, KeysType.AGG_KEYS, storageType,
TStorageMedium.SSD, columns, null, 0, latch, null, false,
TTabletType.TABLET_TYPE_DISK, null,
- TCompressionType.LZ4F, false, "", false, false, false, "", 0,
0, 0, 0, 0, false, null, null, objectPool, rowStorePageSize, false,
- storagePageSize);
+ TCompressionType.LZ4F, false, "", false, false, false, "", 0,
0, 0, 0, 0, false, null, null, objectPool, rowStorePageSize, false);
// drop
dropTask = new DropReplicaTask(backendId1, tabletId1, replicaId1,
schemaHash1, false);
diff --git a/gensrc/proto/olap_file.proto b/gensrc/proto/olap_file.proto
index 1b1afbb9d2b..36c1ed642c6 100644
--- a/gensrc/proto/olap_file.proto
+++ b/gensrc/proto/olap_file.proto
@@ -392,7 +392,6 @@ message TabletSchemaPB {
optional int64 row_store_page_size = 27 [default=16384];
optional bool variant_enable_flatten_nested = 28 [default=false];
- optional int64 storage_page_size = 30 [default=65536];
}
message TabletSchemaCloudPB {
@@ -425,8 +424,6 @@ message TabletSchemaCloudPB {
optional bool enable_mow_light_delete = 28 [default=false];
optional bool enable_variant_flatten_nested = 29 [default=false];
- optional int64 storage_page_size = 31 [default=65536];
-
optional bool is_dynamic_schema = 100 [default=false];
}
diff --git a/gensrc/thrift/AgentService.thrift
b/gensrc/thrift/AgentService.thrift
index abffd176ef8..f02b8c0f886 100644
--- a/gensrc/thrift/AgentService.thrift
+++ b/gensrc/thrift/AgentService.thrift
@@ -49,7 +49,6 @@ struct TTabletSchema {
20: optional list<i32> row_store_col_cids
21: optional i64 row_store_page_size = 16384
22: optional bool variant_enable_flatten_nested = false
- 23: optional i64 storage_page_size = 65536
}
// this enum stands for different storage format in src_backends
diff --git a/regression-test/data/query_p0/system/test_table_properties.out
b/regression-test/data/query_p0/system/test_table_properties.out
index 70413bc4864..896df77f6f0 100644
--- a/regression-test/data/query_p0/system/test_table_properties.out
+++ b/regression-test/data/query_p0/system/test_table_properties.out
@@ -1,6 +1,6 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !select_check_1 --
-102
+99
-- !select_check_2 --
internal test_table_properties_db duplicate_table _auto_bucket
false
@@ -28,7 +28,6 @@ internal test_table_properties_db duplicate_table
row_store_page_size 16384
internal test_table_properties_db duplicate_table
skip_write_index_on_load false
internal test_table_properties_db duplicate_table storage_format
V2
internal test_table_properties_db duplicate_table storage_medium
HDD
-internal test_table_properties_db duplicate_table
storage_page_size 65536
internal test_table_properties_db duplicate_table
store_row_column false
internal test_table_properties_db duplicate_table
time_series_compaction_empty_rowsets_threshold 5
internal test_table_properties_db duplicate_table
time_series_compaction_file_count_threshold 2000
@@ -61,7 +60,6 @@ internal test_table_properties_db listtable
row_store_page_size 16384
internal test_table_properties_db listtable
skip_write_index_on_load false
internal test_table_properties_db listtable storage_format
V2
internal test_table_properties_db listtable storage_medium
HDD
-internal test_table_properties_db listtable
storage_page_size 65536
internal test_table_properties_db listtable
store_row_column false
internal test_table_properties_db listtable
time_series_compaction_empty_rowsets_threshold 5
internal test_table_properties_db listtable
time_series_compaction_file_count_threshold 2000
@@ -94,7 +92,6 @@ internal test_table_properties_db unique_table
row_store_page_size 16384
internal test_table_properties_db unique_table
skip_write_index_on_load false
internal test_table_properties_db unique_table storage_format
V2
internal test_table_properties_db unique_table storage_medium
HDD
-internal test_table_properties_db unique_table
storage_page_size 65536
internal test_table_properties_db unique_table
store_row_column false
internal test_table_properties_db unique_table
time_series_compaction_empty_rowsets_threshold 5
internal test_table_properties_db unique_table
time_series_compaction_file_count_threshold 2000
@@ -129,7 +126,6 @@ internal test_table_properties_db duplicate_table
row_store_page_size 16384
internal test_table_properties_db duplicate_table
skip_write_index_on_load false
internal test_table_properties_db duplicate_table storage_format
V2
internal test_table_properties_db duplicate_table storage_medium
HDD
-internal test_table_properties_db duplicate_table
storage_page_size 65536
internal test_table_properties_db duplicate_table
store_row_column false
internal test_table_properties_db duplicate_table
time_series_compaction_empty_rowsets_threshold 5
internal test_table_properties_db duplicate_table
time_series_compaction_file_count_threshold 2000
@@ -162,7 +158,6 @@ internal test_table_properties_db unique_table
row_store_page_size 16384
internal test_table_properties_db unique_table
skip_write_index_on_load false
internal test_table_properties_db unique_table storage_format
V2
internal test_table_properties_db unique_table storage_medium
HDD
-internal test_table_properties_db unique_table
storage_page_size 65536
internal test_table_properties_db unique_table
store_row_column false
internal test_table_properties_db unique_table
time_series_compaction_empty_rowsets_threshold 5
internal test_table_properties_db unique_table
time_series_compaction_file_count_threshold 2000
@@ -199,7 +194,6 @@ internal test_table_properties_db duplicate_table
row_store_page_size 16384
internal test_table_properties_db duplicate_table
skip_write_index_on_load false
internal test_table_properties_db duplicate_table storage_format
V2
internal test_table_properties_db duplicate_table storage_medium
HDD
-internal test_table_properties_db duplicate_table
storage_page_size 65536
internal test_table_properties_db duplicate_table
store_row_column false
internal test_table_properties_db duplicate_table
time_series_compaction_empty_rowsets_threshold 5
internal test_table_properties_db duplicate_table
time_series_compaction_file_count_threshold 2000
diff --git
a/regression-test/suites/fault_injection_p0/test_storage_page_size_fault.groovy
b/regression-test/suites/fault_injection_p0/test_storage_page_size_fault.groovy
deleted file mode 100644
index 76b666ecba7..00000000000
---
a/regression-test/suites/fault_injection_p0/test_storage_page_size_fault.groovy
+++ /dev/null
@@ -1,71 +0,0 @@
-// 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.
-
-suite("test_storage_page_size_fault", "nonConcurrent") {
- def backendId_to_backendIP = [:]
- def backendId_to_backendHttpPort = [:]
- getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
-
- boolean disableAutoCompaction = false
-
- def set_be_config = { key, value ->
- for (String backend_id: backendId_to_backendIP.keySet()) {
- def (code, out, err) =
update_be_config(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), key, value)
- logger.info("update config: code=" + code + ", out=" + out + ",
err=" + err)
- }
- }
-
- def dbName = "regression_test_fault_injection_p0"
- def tableName = "test_storage_page_size_fault"
-
- sql "DROP TABLE IF EXISTS ${tableName}"
- sql """
- CREATE TABLE ${tableName} (
- `@timestamp` int(11) NULL COMMENT "",
- `clientip` varchar(20) NULL COMMENT "",
- `request` text NULL COMMENT "",
- `status` int(11) NULL COMMENT "",
- `size` int(11) NULL COMMENT ""
- ) ENGINE=OLAP
- DUPLICATE KEY(`@timestamp`)
- COMMENT "OLAP"
- DISTRIBUTED BY RANDOM BUCKETS 1
- PROPERTIES (
- "replication_allocation" = "tag.location.default: 1",
- "disable_auto_compaction" = "true",
- "storage_page_size" = "65537"
- );
- """
-
- def tableId = getTableId(dbName, tableName)
- if (tableId == null) {
- throw new IllegalStateException("Table ID not found for table:
${tableName}")
- }
- logger.info("tableId: " + tableId)
-
- try {
-
GetDebugPoint().enableDebugPointForAllBEs("VerticalSegmentWriter._create_column_writer.storage_page_size",
["table_id": tableId, "storage_page_size": 69632])
- sql """ INSERT INTO ${tableName} VALUES (893964617, '40.135.0.0', 'GET
/images/hm_bg.jpg HTTP/1.0', 200, 24736); """
-
- set_be_config.call("enable_vertical_segment_writer", "false")
- sql """ INSERT INTO ${tableName} VALUES (893964617, '40.135.0.0', 'GET
/images/hm_bg.jpg HTTP/1.0', 200, 24736); """
- set_be_config.call("enable_vertical_segment_writer", "true")
-
- } finally {
-
GetDebugPoint().disableDebugPointForAllBEs("VerticalSegmentWriter._create_column_writer.storage_page_size")
- }
-}
\ No newline at end of file
diff --git
a/regression-test/suites/query_p0/system/test_storage_page_size.groovy
b/regression-test/suites/query_p0/system/test_storage_page_size.groovy
deleted file mode 100644
index 9d7b129226d..00000000000
--- a/regression-test/suites/query_p0/system/test_storage_page_size.groovy
+++ /dev/null
@@ -1,190 +0,0 @@
-// 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_storage_page_size") {
- sql """ DROP TABLE IF EXISTS table_1; """
- sql """
- create table table_1 (
- k1 int not null,
- k2 int not null,
- k3 bigint null,
- k4 varchar(100) null
- )
- duplicate key (k1)
- distributed BY random buckets 1
- properties("replication_num" = "1");
- """
- test {
- sql "show create table table_1;"
- check { result, exception, startTime, endTime ->
- assertFalse(result[0][1].contains("\"storage_page_size\" =
\"65536\""))
- }
- }
-
- // min - 1
- sql """ DROP TABLE IF EXISTS table_2; """
- test {
- sql """
- create table table_2 (
- k1 int not null,
- k2 int not null,
- k3 bigint null,
- k4 varchar(100) null
- )
- duplicate key (k1)
- distributed BY random buckets 1
- properties("replication_num" = "1", "storage_page_size" = "4095");
- """
- check { result, exception, startTime, endTime ->
- if (exception) {
- assert exception.message.contains("Storage page size must be
between 4KB and 10MB.")
- }
- }
- }
-
- // min
- sql """ DROP TABLE IF EXISTS table_3; """
- sql """
- create table table_3 (
- k1 int not null,
- k2 int not null,
- k3 bigint null,
- k4 varchar(100) null
- )
- duplicate key (k1)
- distributed BY random buckets 1
- properties("replication_num" = "1", "storage_page_size" = "4096");
- """
- test {
- sql "show create table table_3;"
- check { result, exception, startTime, endTime ->
- assertTrue(result[0][1].contains("\"storage_page_size\" =
\"4096\""))
- }
- }
-
-
- // min + 1
- sql """ DROP TABLE IF EXISTS table_4; """
- sql """
- create table table_4 (
- k1 int not null,
- k2 int not null,
- k3 bigint null,
- k4 varchar(100) null
- )
- duplicate key (k1)
- distributed BY random buckets 1
- properties("replication_num" = "1", "storage_page_size" = "4097");
- """
- test {
- sql "show create table table_4;"
- check { result, exception, startTime, endTime ->
- assertTrue(result[0][1].contains("\"storage_page_size\" =
\"8192\""))
- }
- }
-
- // 65537
- sql """ DROP TABLE IF EXISTS table_5; """
- sql """
- create table table_5 (
- k1 int not null,
- k2 int not null,
- k3 bigint null,
- k4 varchar(100) null
- )
- duplicate key (k1)
- distributed BY random buckets 1
- properties("replication_num" = "1", "storage_page_size" = "65537");
- """
- test {
- sql "show create table table_5;"
- check { result, exception, startTime, endTime ->
- assertTrue(result[0][1].contains("\"storage_page_size\" =
\"69632\""))
- }
- }
- test {
- sql """ alter table table_5 set ("storage_page_size" = "65535"); """
- check { result, exception, startTime, endTime ->
- if (exception) {
- assert exception.message.contains("You can not modify
storage_page_size")
- }
- }
- }
-
- // max - 1
- sql """ DROP TABLE IF EXISTS table_6; """
- sql """
- create table table_6 (
- k1 int not null,
- k2 int not null,
- k3 bigint null,
- k4 varchar(100) null
- )
- duplicate key (k1)
- distributed BY random buckets 1
- properties("replication_num" = "1", "storage_page_size" = "10485759");
- """
- test {
- sql "show create table table_6;"
- check { result, exception, startTime, endTime ->
- assertTrue(result[0][1].contains("\"storage_page_size\" =
\"10485760\""))
- }
- }
-
- // max
- sql """ DROP TABLE IF EXISTS table_7; """
- sql """
- create table table_7 (
- k1 int not null,
- k2 int not null,
- k3 bigint null,
- k4 varchar(100) null
- )
- duplicate key (k1)
- distributed BY random buckets 1
- properties("replication_num" = "1", "storage_page_size" = "10485760");
- """
- test {
- sql "show create table table_7;"
- check { result, exception, startTime, endTime ->
- assertTrue(result[0][1].contains("\"storage_page_size\" =
\"10485760\""))
- }
- }
-
- // max + 1
- sql """ DROP TABLE IF EXISTS table_8; """
- test {
- sql """
- create table table_8 (
- k1 int not null,
- k2 int not null,
- k3 bigint null,
- k4 varchar(100) null
- )
- duplicate key (k1)
- distributed BY random buckets 1
- properties("replication_num" = "1", "storage_page_size" =
"10485761");
- """
- check { result, exception, startTime, endTime ->
- if (exception) {
- assert exception.message.contains("Storage page size must be
between 4KB and 10MB.")
- }
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
