This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new cb485419f5 Revert "[fix](show-stmt) fix show create table missing
storage_medium info (#21757)"
cb485419f5 is described below
commit cb485419f5c990d14a3b8aabbda000007a5f9599
Author: Kang <kxiao.ti...@gmail.com>
AuthorDate: Tue Aug 1 10:24:29 2023 +0800
Revert "[fix](show-stmt) fix show create table missing storage_medium info
(#21757)"
This reverts commit e5359ba03ce03cd4e122e4304833364397d7e862.
---
.../org/apache/doris/catalog/DataProperty.java | 16 ------
.../main/java/org/apache/doris/catalog/Env.java | 4 --
.../java/org/apache/doris/catalog/OlapTable.java | 22 --------
.../apache/doris/datasource/InternalCatalog.java | 5 +-
.../analysis/CreateTableAsSelectStmtTest.java | 60 ++++++++--------------
.../org/apache/doris/catalog/CreateTableTest.java | 23 ---------
6 files changed, 21 insertions(+), 109 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
index 23b4508c94..7028e5e449 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
@@ -55,22 +55,6 @@ public class DataProperty implements Writable,
GsonPostProcessable {
// for persist
}
- public String getStorageMediumString() {
- int val = storageMedium.getValue();
- switch (val) {
- case 0:
- return "hdd";
- case 1:
- return "ssd";
- case 2:
- return "s3";
- case 3:
- return "remote_cache";
- default:
- return "unknown";
- }
- }
-
public DataProperty(TStorageMedium medium) {
this.storageMedium = medium;
this.cooldownTimeMs = MAX_COOLDOWN_TIME_MS;
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 5d380fe7c7..9f2797fe78 100755
--- 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
@@ -3139,10 +3139,6 @@ public class Env {
sb.append(",\n\"").append(PropertyAnalyzer.PROPERTIES_ENABLE_SINGLE_REPLICA_COMPACTION).append("\"
= \"");
sb.append(olapTable.enableSingleReplicaCompaction()).append("\"");
- // storage medium
-
sb.append(",\n\"").append(PropertyAnalyzer.PROPERTIES_STORAGE_MEDIUM).append("\"
= \"");
- sb.append(olapTable.getStorageMedium()).append("\"");
-
// enable duplicate without keys by default
if (olapTable.isDuplicateWithoutKey()) {
sb.append(",\n\"")
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 6664dfe537..0a4ad6e52a 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
@@ -151,8 +151,6 @@ public class OlapTable extends Table {
private TableProperty tableProperty;
- private String storageMedium;
-
public OlapTable() {
// for persist
super(TableType.OLAP);
@@ -1280,13 +1278,6 @@ public class OlapTable extends Table {
}
tempPartitions.write(out);
-
- if (storageMedium == null || storageMedium.length() == 0) {
- out.writeBoolean(false);
- } else {
- out.writeBoolean(true);
- Text.writeString(out, storageMedium);
- }
}
@Override
@@ -1383,10 +1374,6 @@ public class OlapTable extends Table {
}
tempPartitions.unsetPartitionInfo();
- if (in.readBoolean()) {
- storageMedium = Text.readString(in);
- }
-
// In the present, the fullSchema could be rebuilt by schema change
while the properties is changed by MV.
// After that, some properties of fullSchema and nameToColumn may be
not same as properties of base columns.
// So, here we need to rebuild the fullSchema to ensure the
correctness of the properties.
@@ -1810,15 +1797,6 @@ public class OlapTable extends Table {
return false;
}
-
- public void setStorageMedium(String medium) {
- storageMedium = medium;
- }
-
- public String getStorageMedium() {
- return storageMedium;
- }
-
public void setStoreRowColumn(boolean storeRowColumn) {
TableProperty tableProperty = getOrCreatTableProperty();
tableProperty.modifyTableProperties(PropertyAnalyzer.PROPERTIES_STORE_ROW_COLUMN,
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 132f2cfa5f..a4ada8e761 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
@@ -2137,7 +2137,6 @@ public class InternalCatalog implements
CatalogIf<Database> {
try {
dataProperty =
PropertyAnalyzer.analyzeDataProperty(stmt.getProperties(),
new DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
-
olapTable.setStorageMedium(dataProperty.getStorageMediumString());
} catch (AnalysisException e) {
throw new DdlException(e.getMessage());
}
@@ -2303,12 +2302,10 @@ public class InternalCatalog implements
CatalogIf<Database> {
} else if (partitionInfo.getType() == PartitionType.RANGE
|| partitionInfo.getType() == PartitionType.LIST) {
try {
- DataProperty dataProperty = null;
// just for remove entries in stmt.getProperties(),
// and then check if there still has unknown properties
- dataProperty =
PropertyAnalyzer.analyzeDataProperty(stmt.getProperties(),
+ PropertyAnalyzer.analyzeDataProperty(stmt.getProperties(),
new
DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
-
olapTable.setStorageMedium(dataProperty.getStorageMediumString());
if (partitionInfo.getType() == PartitionType.RANGE) {
DynamicPartitionUtil.checkAndSetDynamicPartitionProperty(olapTable, properties,
db);
} else if (partitionInfo.getType() == PartitionType.LIST) {
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
index 2e031b1d36..e3e25b90ab 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
@@ -95,8 +95,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showCreateTableByName("select_decimal_table").getResultRows().get(0).get(1));
String selectFromDecimal1 =
@@ -116,8 +115,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" =
\"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" =
\"false\"\n"
+ ");",
showCreateTableByName("select_decimal_table_1").getResultRows().get(0).get(1));
} else {
@@ -133,8 +131,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" =
\"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" =
\"false\"\n"
+ ");",
showCreateTableByName("select_decimal_table_1").getResultRows().get(0).get(1));
}
@@ -168,8 +165,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet.getResultRows().get(0).get(1));
}
@@ -192,8 +188,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet1.getResultRows().get(0).get(1));
@@ -218,8 +213,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet2.getResultRows().get(0).get(1));
}
@@ -241,8 +235,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");", showResultSet1.getResultRows().get(0).get(1));
String selectAlias2 = "create table `test`.`select_alias_2`
PROPERTIES(\"replication_num\" = \"1\") "
+ "as select userId as alias_name, username from
`test`.`varchar_table`";
@@ -260,8 +253,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet2.getResultRows().get(0).get(1));
}
@@ -286,8 +278,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet.getResultRows().get(0).get(1));
String selectFromJoin1 = "create table `test`.`select_join1`
PROPERTIES(\"replication_num\" = \"1\") "
@@ -309,8 +300,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet1.getResultRows().get(0).get(1));
}
@@ -336,8 +326,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet.getResultRows().get(0).get(1));
}
@@ -360,8 +349,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");", showResultSet.getResultRows().get(0).get(1));
}
@@ -383,8 +371,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet.getResultRows().get(0).get(1));
String selectFromCteAndUnion = "create table `test`.`select_cte_union`
PROPERTIES(\"replication_num\" = \"1\")"
@@ -402,8 +389,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");", showResultSet1.getResultRows().get(0).get(1));
}
@@ -428,8 +414,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet.getResultRows().get(0).get(1));
}
@@ -453,8 +438,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet.getResultRows().get(0).get(1));
}
@@ -477,8 +461,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet.getResultRows().get(0).get(1));
}
@@ -502,8 +485,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" = \"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" = \"false\"\n"
+ ");",
showResultSet.getResultRows().get(0).get(1));
}
@@ -551,8 +533,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" =
\"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" =
\"false\"\n"
+ ");",
createTableStmts.get(0));
} else {
@@ -568,8 +549,7 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "\"storage_format\" = \"V2\",\n"
+ "\"light_schema_change\" = \"true\",\n"
+ "\"disable_auto_compaction\" = \"false\",\n"
- + "\"enable_single_replica_compaction\" =
\"false\",\n"
- + "\"storage_medium\" = \"hdd\"\n"
+ + "\"enable_single_replica_compaction\" =
\"false\"\n"
+ ");",
createTableStmts.get(0));
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java
index 4e52ac8e51..7d45752426 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java
@@ -146,16 +146,6 @@ public class CreateTableTest {
.expectThrowsNoException(() -> createTable("create table
test.tb7(key1 int, key2 varchar(10)) \n"
+ "distributed by hash(key1) buckets 1
properties('replication_num' = '1', 'storage_medium' = 'ssd');"));
- ConfigBase.setMutableConfig("disable_storage_medium_check", "true");
- ExceptionChecker
- .expectThrowsNoException(() -> createTable("create table
test.tb7_1(key1 int, key2 varchar(10))\n"
- + "PARTITION BY RANGE(`key1`) (\n"
- + " PARTITION `p1` VALUES LESS THAN
(\"10\"),\n"
- + " PARTITION `p2` VALUES LESS THAN
(\"20\"),\n"
- + " PARTITION `p3` VALUES LESS THAN
(\"30\"))\n"
- + "distributed by hash(key1)\n"
- + "buckets 1 properties('replication_num' =
'1', 'storage_medium' = 'ssd');"));
-
ExceptionChecker
.expectThrowsNoException(() -> createTable("create table
test.compression1(key1 int, key2 varchar(10)) \n"
+ "distributed by hash(key1) buckets 1 \n"
@@ -311,19 +301,6 @@ public class CreateTableTest {
() -> createTable("create table test.tb7(key1 int,
key2 varchar(10)) distributed by hash(key1) \n"
+ "buckets 1 properties('replication_num' =
'1', 'storage_medium' = 'ssd');"));
- ConfigBase.setMutableConfig("disable_storage_medium_check", "false");
- ExceptionChecker
- .expectThrowsWithMsg(DdlException.class, "Failed to find
enough backend, please check the replication num,replication tag and storage
medium.\n"
- + "Create failed replications:\n"
- + "replication tag: {\"location\" :
\"default\"}, replication num: 1, storage medium: SSD",
- () -> createTable("create table test.tb7_1(key1 int,
key2 varchar(10))\n"
- + "PARTITION BY RANGE(`key1`) (\n"
- + " PARTITION `p1` VALUES LESS THAN
(\"10\"),\n"
- + " PARTITION `p2` VALUES LESS THAN
(\"20\"),\n"
- + " PARTITION `p3` VALUES LESS THAN
(\"30\"))\n"
- + "distributed by hash(key1)\n"
- + "buckets 1 properties('replication_num' =
'1', 'storage_medium' = 'ssd');"));
-
ExceptionChecker
.expectThrowsWithMsg(DdlException.class, "sequence column only
support UNIQUE_KEYS",
() -> createTable("create table test.atbl8\n" + "(k1
varchar(40), k2 int, v1 int sum)\n"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
