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

[BUG] Fix a bug when modify table's colocate group with same name (#6695)

Browse Source 
If new group name is the same as old group name when mod table colocate group name,
the group has been in an unstable state
This commit is contained in:
shee
2021-09-27 10:34:41 +08:00
committed by GitHub
parent 850cf10991
commit e4d999274f
2 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
View File

@ -5336,6 +5336,14 @@ public class Catalog {
GroupId groupId = null;
if (!Strings.isNullOrEmpty(colocateGroup)) {
String fullGroupName = db.getId() + "_" + colocateGroup;
//When the new name is the same as the old name, we return it to prevent npe
if (!Strings.isNullOrEmpty(oldGroup)) {
String oldFullGroupName = db.getId() + "_" + oldGroup;
if (oldFullGroupName.equals(fullGroupName)) {
LOG.warn("modify table[{}] group name same as old group name,skip.", table.getName());
return;
}
}
ColocateGroupSchema groupSchema = colocateTableIndex.getGroupSchema(fullGroupName);
if (groupSchema == null) {
// user set a new colocate group,

40
fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableTest.java
View File

@ -17,6 +17,7 @@
package org.apache.doris.catalog;
import org.apache.doris.analysis.AlterTableStmt;
import org.apache.doris.analysis.CreateDbStmt;
import org.apache.doris.analysis.CreateTableStmt;
import org.apache.doris.analysis.DropDbStmt;
@ -90,6 +91,11 @@ public class ColocateTableTest {
Catalog.getCurrentCatalog().createTable(createTableStmt);
}
private static void alterTable(String sql) throws Exception {
AlterTableStmt alterTableStmt = (AlterTableStmt) UtFrameUtils.parseAndAnalyzeStmt(sql, connectContext);
Catalog.getCurrentCatalog().alterTable(alterTableStmt);
}
@Test
public void testCreateOneTable() throws Exception {
createTable("create table " + dbName + "." + tableName1 + " (\n" +
@ -318,4 +324,38 @@ public class ColocateTableTest {
" \"colocate_with\" = \"" + groupName + "\"\n" +
");");
}
@Test
public void testModifyGroupNameForBucketSeqInconsistent() throws Exception {
createTable("create table " + dbName + "." + tableName1 + " (\n" +
" `k1` int NULL COMMENT \"\",\n" +
" `k2` varchar(10) NULL COMMENT \"\"\n" +
") ENGINE=OLAP\n" +
"DUPLICATE KEY(`k1`, `k2`)\n" +
"COMMENT \"OLAP\"\n" +
"DISTRIBUTED BY HASH(`k1`, `k2`) BUCKETS 1\n" +
"PROPERTIES (\n" +
" \"replication_num\" = \"1\",\n" +
" \"colocate_with\" = \"" + groupName + "\"\n" +
");");
ColocateTableIndex index = Catalog.getCurrentColocateIndex();
Database db = Catalog.getCurrentCatalog().getDbOrMetaException(fullDbName);
long tableId = db.getTableOrMetaException(tableName1).getId();
GroupId groupId1 = index.getGroup(tableId);
Map<Tag, List<List<Long>>> backendIds1 = index.getBackendsPerBucketSeq(groupId1);
Assert.assertEquals(1, backendIds1.get(Tag.DEFAULT_BACKEND_TAG).get(0).size());
// set same group name
alterTable("ALTER TABLE "+ dbName + "." + tableName1 + " SET (" + "\"colocate_with\" = \"" + groupName + "\")");
GroupId groupId2 = index.getGroup(tableId);
// verify groupId group2BackendsPerBucketSeq
Map<Tag, List<List<Long>>> backendIds2 = index.getBackendsPerBucketSeq(groupId2);
Assert.assertEquals(1, backendIds2.get(Tag.DEFAULT_BACKEND_TAG).get(0).size());
Assert.assertEquals(groupId1, groupId2);
Assert.assertEquals(backendIds1, backendIds2);
}
}