database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[enhancement](binlog) CreateTable inherit db binlog && Add some checks (#22293)

Browse Source
This commit is contained in:
Jack Drogon
2023-07-29 08:27:27 +08:00
committed by GitHub
parent ae8a26335c
commit ebd114b384
6 changed files with 113 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
View File

@ -2799,7 +2799,6 @@ public class SchemaChangeHandler extends AlterHandler {
public boolean updateBinlogConfig(Database db, OlapTable olapTable, List<AlterClause> alterClauses)
throws DdlException, UserException {
// TODO(Drogon): check olapTable read binlog thread safety
List<Partition> partitions = Lists.newArrayList();
BinlogConfig oldBinlogConfig;
BinlogConfig newBinlogConfig;

3
fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java
View File

@ -269,6 +269,9 @@ public class CreateTableStmt extends DdlStmt {
}
public Map<String, String> getProperties() {
if (this.properties == null) {
this.properties = Maps.newHashMap();
}
return this.properties;
}

4
fe/fe-core/src/main/java/org/apache/doris/catalog/BinlogConfig.java
View File

@ -64,6 +64,10 @@ public class BinlogConfig implements Writable {
}
public void mergeFromProperties(Map<String, String> properties) {
if (properties == null) {
return;
}
if (properties.containsKey(PropertyAnalyzer.PROPERTIES_BINLOG_ENABLE)) {
enable = Boolean.parseBoolean(properties.get(
PropertyAnalyzer.PROPERTIES_BINLOG_ENABLE));

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

@ -1889,6 +1889,20 @@ public class InternalCatalog implements CatalogIf<Database> {
String tableName = stmt.getTableName();
LOG.debug("begin create olap table: {}", tableName);
BinlogConfig dbBinlogConfig;
db.readLock();
try {
dbBinlogConfig = new BinlogConfig(db.getBinlogConfig());
} finally {
db.readUnlock();
}
BinlogConfig createTableBinlogConfig = new BinlogConfig(dbBinlogConfig);
createTableBinlogConfig.mergeFromProperties(stmt.getProperties());
if (dbBinlogConfig.isEnable() && !createTableBinlogConfig.isEnable()) {
throw new DdlException("Cannot create table with binlog disabled when database binlog enable");
}
stmt.getProperties().putAll(createTableBinlogConfig.toProperties());
// get keys type
KeysDesc keysDesc = stmt.getKeysDesc();
Preconditions.checkNotNull(keysDesc);

8
fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
View File

@ -111,7 +111,7 @@ public class CreateTableStmtTest {
stmt.analyze(analyzer);
Assert.assertEquals("testCluster:db1", stmt.getDbName());
Assert.assertEquals("table1", stmt.getTableName());
Assert.assertNull(stmt.getProperties());
Assert.assertTrue(stmt.getProperties() == null || stmt.getProperties().isEmpty());
}
@Test
@ -121,7 +121,7 @@ public class CreateTableStmtTest {
stmt.analyze(analyzer);
Assert.assertEquals("testCluster:db1", stmt.getDbName());
Assert.assertEquals("table1", stmt.getTableName());
Assert.assertNull(stmt.getProperties());
Assert.assertTrue(stmt.getProperties() == null || stmt.getProperties().isEmpty());
Assert.assertTrue(stmt.toSql().contains("DISTRIBUTED BY RANDOM\nBUCKETS 6"));
}
@ -242,7 +242,7 @@ public class CreateTableStmtTest {
stmt.analyze(analyzer);
Assert.assertEquals("testCluster:db1", stmt.getDbName());
Assert.assertEquals("table1", stmt.getTableName());
Assert.assertNull(stmt.getProperties());
Assert.assertTrue(stmt.getProperties() == null || stmt.getProperties().isEmpty());
Assert.assertTrue(stmt.toSql()
.contains("rollup( `index1` (`col1`, `col2`) FROM `table1`, `index2` (`col2`, `col3`) FROM `table1`)"));
}
@ -256,7 +256,7 @@ public class CreateTableStmtTest {
Assert.assertEquals("testDb", stmt.getDbName());
Assert.assertEquals("table1", stmt.getTableName());
Assert.assertNull(stmt.getPartitionDesc());
Assert.assertNull(stmt.getProperties());
Assert.assertTrue(stmt.getProperties() == null || stmt.getProperties().isEmpty());
}
@Test(expected = AnalysisException.class)