Skip to content

[fix](test) Fix the unstable test #51182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2025
Merged

[fix](test) Fix the unstable test #51182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions ...est/java/org/apache/doris/nereids/trees/plans/commands/CreateStorageVaultCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.UserException;
import org.apache.doris.mysql.privilege.AccessControllerManager;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
Expand All @@ -39,49 +38,39 @@ public class CreateStorageVaultCommandTest extends TestWithFeService {

@Override
protected void runBeforeAll() throws Exception {
vaultName = "hdfs";
vaultName = "hdfs_nereids";
FeConstants.runningUnitTest = true;
}

@Test
public void testValidateNormal(@Mocked AccessControllerManager accessManager) {
new Expectations() {
{
Env.getCurrentEnv().getAccessManager();
minTimes = 0;
result = accessManager;

accessManager.checkGlobalPriv((ConnectContext) any, PrivPredicate.ADMIN);
minTimes = 0;
result = true;
}
};

Config.cloud_unique_id = "not_empty";
Config.cloud_unique_id = "not_empty_nereids";
ImmutableMap<String, String> properties = ImmutableMap.<String, String>builder()
.put("type", "hdfs")
.build();
CreateStorageVaultCommand command = new CreateStorageVaultCommand(true, vaultName, properties);
Assertions.assertDoesNotThrow(() -> command.validate());
Assertions.assertEquals(vaultName, command.getVaultName());
Assertions.assertEquals(StorageVault.StorageVaultType.HDFS, command.getVaultType());
Config.cloud_unique_id = "";
}

@Test
public void testUnsupportedResourceType(@Mocked Env env, @Mocked AccessControllerManager accessManager)
throws UserException {
new Expectations() {
{
env.getAccessManager();
result = accessManager;
accessManager.checkGlobalPriv((ConnectContext) any, PrivPredicate.ADMIN);
result = true;
}
};

Config.cloud_unique_id = "not_empty";
ImmutableMap<String, String> properties = ImmutableMap.<String, String>builder()
// testUnsupportedResourceType
ImmutableMap<String, String> properties1 = ImmutableMap.<String, String>builder()
.put("type", "hadoop")
.build();
CreateStorageVaultCommand command = new CreateStorageVaultCommand(true, vaultName, properties);
Assertions.assertThrows(AnalysisException.class, () -> command.validate());
CreateStorageVaultCommand command1 = new CreateStorageVaultCommand(true, vaultName, properties1);
Assertions.assertThrows(AnalysisException.class, () -> command1.validate());
Config.cloud_unique_id = "";
}
}
85 changes: 44 additions & 41 deletions ...src/test/java/org/apache/doris/nereids/trees/plans/commands/TruncateTableCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ public class TruncateTableCommandTest extends TestWithFeService {
@Override
protected void runBeforeAll() throws Exception {
Config.enable_debug_points = true;
createDatabase("test");
connectContext.setDatabase("test");
createDatabase("testcommand");
connectContext.setDatabase("testcommand");

String createTableStr = "create table test.tbl(d1 date, k1 int, k2 bigint)"
String createTableStr = "create table testcommand.tblcommand(d1 date, k1 int, k2 bigint)"
+ "duplicate key(d1, k1) "
+ "PARTITION BY RANGE(d1)"
+ "(PARTITION p20210901 VALUES [('2021-09-01'), ('2021-09-02')))"
+ "distributed by hash(k1) buckets 2 "
+ "properties('replication_num' = '1');";
createTable(createTableStr);

String createTable2 = "CREATE TABLE test.case_sensitive_table (\n"
String createTable2 = "CREATE TABLE testcommand.case_sensitive_table_command (\n"
+ " `date_id` date NULL COMMENT \"\",\n"
+ " `column2` tinyint(4) NULL COMMENT \"\"\n"
+ ") ENGINE=OLAP\n"
Expand All @@ -83,17 +83,20 @@ protected void runBeforeAll() throws Exception {
}

@Test
public void testValidate(@Mocked Env env, @Mocked AccessControllerManager accessManager) {
public void testValidate(@Mocked AccessControllerManager accessManager) {
new Expectations() {
{
env.getAccessManager();
Env.getCurrentEnv().getAccessManager();
minTimes = 0;
result = accessManager;

accessManager.checkTblPriv((ConnectContext) any, anyString, anyString, anyString, PrivPredicate.LOAD);
minTimes = 0;
result = true;
}
};

String truncateStr = "TRUNCATE TABLE internal.test.case_sensitive_table PARTITION P20211008; \n";
String truncateStr = "TRUNCATE TABLE internal.testcommand.case_sensitive_table_command PARTITION P20211008; \n";

NereidsParser nereidsParser = new NereidsParser();
LogicalPlan plan = nereidsParser.parseSingle(truncateStr);
Expand All @@ -108,12 +111,12 @@ public void testValidate(@Mocked Env env, @Mocked AccessControllerManager access
connectContext.setDatabase("test"); //reset database

// test no table
tableNameInfo = new TableNameInfo("internal", "test", "");
tableNameInfo = new TableNameInfo("internal", "testcommand", "");
TruncateTableCommand truncateTableCommand1 = new TruncateTableCommand(tableNameInfo, Optional.empty(), false);
Assertions.assertThrows(AnalysisException.class, () -> truncateTableCommand1.validate(connectContext));

// test no partition
tableNameInfo = new TableNameInfo("internal", "test", "test");
tableNameInfo = new TableNameInfo("internal", "testcommand", "test");
PartitionNamesInfo partitionNamesInfo = new PartitionNamesInfo(false);
TruncateTableCommand truncateTableCommand2 = new TruncateTableCommand(tableNameInfo, Optional.of(partitionNamesInfo), false);
Assertions.assertThrows(AnalysisException.class, () -> truncateTableCommand2.validate(connectContext));
Expand All @@ -122,8 +125,8 @@ public void testValidate(@Mocked Env env, @Mocked AccessControllerManager access
@Test
public void testTruncateWithCaseInsensitivePartitionName() throws Exception {
//now in order to support auto create partition, need set partition name is case sensitive
Database db = Env.getCurrentInternalCatalog().getDbNullable("test");
OlapTable tbl = db.getOlapTableOrDdlException("case_sensitive_table");
Database db = Env.getCurrentInternalCatalog().getDbNullable("testcommand");
OlapTable tbl = db.getOlapTableOrDdlException("case_sensitive_table_command");

long p20211006Id = tbl.getPartition("p20211006").getId();
long p20211007Id = tbl.getPartition("P20211007").getId();
Expand All @@ -133,7 +136,7 @@ public void testTruncateWithCaseInsensitivePartitionName() throws Exception {
Partition p20211008 = tbl.getPartition("P20211008");
p20211008.updateVisibleVersion(2L);
p20211008.setNextVersion(p20211008.getVisibleVersion() + 1);
String truncateStr = "TRUNCATE TABLE internal.test.case_sensitive_table PARTITION P20211008; \n";
String truncateStr = "TRUNCATE TABLE internal.testcommand.case_sensitive_table_command PARTITION P20211008; \n";

NereidsParser nereidsParser = new NereidsParser();
LogicalPlan plan = nereidsParser.parseSingle(truncateStr);
Expand All @@ -142,7 +145,7 @@ public void testTruncateWithCaseInsensitivePartitionName() throws Exception {
Assertions.assertNotEquals(p20211008Id, tbl.getPartition("P20211008").getId());

// 2. truncate P20211007
truncateStr = "TRUNCATE TABLE internal.test.case_sensitive_table PARTITION P20211007 force; \n";
truncateStr = "TRUNCATE TABLE internal.testcommand.case_sensitive_table_command PARTITION P20211007 force; \n";
plan = nereidsParser.parseSingle(truncateStr);
Assertions.assertTrue(plan instanceof TruncateTableCommand);
Env.getCurrentEnv().truncateTable((TruncateTableCommand) plan);
Expand All @@ -156,77 +159,77 @@ public void testTruncateWithCaseInsensitivePartitionName() throws Exception {

@Test
public void testTruncateTable() throws Exception {
String stmtStr = "ALTER TABLE internal.test.tbl ADD PARTITION p20210902 VALUES [('2021-09-02'), ('2021-09-03'))"
String stmtStr = "ALTER TABLE internal.testcommand.tblcommand ADD PARTITION p20210902 VALUES [('2021-09-02'), ('2021-09-03'))"
+ " DISTRIBUTED BY HASH(`k1`) BUCKETS 3;";
alterTable(stmtStr);
stmtStr = "ALTER TABLE internal.test.tbl ADD PARTITION p20210903 VALUES [('2021-09-03'), ('2021-09-04'))"
stmtStr = "ALTER TABLE internal.testcommand.tblcommand ADD PARTITION p20210903 VALUES [('2021-09-03'), ('2021-09-04'))"
+ " DISTRIBUTED BY HASH(`k1`) BUCKETS 4;";
alterTable(stmtStr);
stmtStr = "ALTER TABLE internal.test.tbl ADD PARTITION p20210904 VALUES [('2021-09-04'), ('2021-09-05'))"
stmtStr = "ALTER TABLE internal.testcommand.tblcommand ADD PARTITION p20210904 VALUES [('2021-09-04'), ('2021-09-05'))"
+ " DISTRIBUTED BY HASH(`k1`) BUCKETS 5;";
alterTable(stmtStr);
checkShowTabletResultNum("internal.test.tbl", "p20210901", 2);
checkShowTabletResultNum("internal.test.tbl", "p20210902", 3);
checkShowTabletResultNum("internal.test.tbl", "p20210903", 4);
checkShowTabletResultNum("internal.test.tbl", "p20210904", 5);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210901", 2);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210902", 3);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210903", 4);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210904", 5);

String truncateStr = "truncate table internal.test.tbl;";
String truncateStr = "truncate table internal.testcommand.tblcommand;";
NereidsParser nereidsParser = new NereidsParser();
LogicalPlan plan = nereidsParser.parseSingle(truncateStr);
Assertions.assertTrue(plan instanceof TruncateTableCommand);
Env.getCurrentEnv().truncateTable((TruncateTableCommand) plan);

checkShowTabletResultNum("internal.test.tbl", "p20210901", 2);
checkShowTabletResultNum("internal.test.tbl", "p20210902", 3);
checkShowTabletResultNum("internal.test.tbl", "p20210903", 4);
checkShowTabletResultNum("internal.test.tbl", "p20210904", 5);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210901", 2);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210902", 3);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210903", 4);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210904", 5);

truncateStr = "truncate table internal.test.tbl partition(p20210901, p20210902, p20210903, p20210904);";
truncateStr = "truncate table internal.testcommand.tblcommand partition(p20210901, p20210902, p20210903, p20210904);";
plan = nereidsParser.parseSingle(truncateStr);
Assertions.assertTrue(plan instanceof TruncateTableCommand);
Env.getCurrentEnv().truncateTable((TruncateTableCommand) plan);

checkShowTabletResultNum("internal.test.tbl", "p20210901", 2);
checkShowTabletResultNum("internal.test.tbl", "p20210902", 3);
checkShowTabletResultNum("internal.test.tbl", "p20210903", 4);
checkShowTabletResultNum("internal.test.tbl", "p20210904", 5);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210901", 2);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210902", 3);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210903", 4);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210904", 5);

truncateStr = "truncate table internal.test.tbl partition (p20210901);";
truncateStr = "truncate table internal.testcommand.tblcommand partition (p20210901);";
plan = nereidsParser.parseSingle(truncateStr);
Assertions.assertTrue(plan instanceof TruncateTableCommand);
Env.getCurrentEnv().truncateTable((TruncateTableCommand) plan);
checkShowTabletResultNum("internal.test.tbl", "p20210901", 2);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210901", 2);

truncateStr = "truncate table internal.test.tbl partition (p20210902);";
truncateStr = "truncate table internal.testcommand.tblcommand partition (p20210902);";
plan = nereidsParser.parseSingle(truncateStr);
Assertions.assertTrue(plan instanceof TruncateTableCommand);
Env.getCurrentEnv().truncateTable((TruncateTableCommand) plan);
checkShowTabletResultNum("internal.test.tbl", "p20210902", 3);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210902", 3);

truncateStr = "truncate table internal.test.tbl partition (p20210903);";
truncateStr = "truncate table internal.testcommand.tblcommand partition (p20210903);";
plan = nereidsParser.parseSingle(truncateStr);
Assertions.assertTrue(plan instanceof TruncateTableCommand);
Env.getCurrentEnv().truncateTable((TruncateTableCommand) plan);
checkShowTabletResultNum("internal.test.tbl", "p20210903", 4);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210903", 4);

truncateStr = "truncate table internal.test.tbl partition (p20210904);";
truncateStr = "truncate table internal.testcommand.tblcommand partition (p20210904);";
plan = nereidsParser.parseSingle(truncateStr);
Assertions.assertTrue(plan instanceof TruncateTableCommand);
Env.getCurrentEnv().truncateTable((TruncateTableCommand) plan);
checkShowTabletResultNum("internal.test.tbl", "p20210904", 5);
checkShowTabletResultNum("internal.testcommand.tblcommand", "p20210904", 5);
}

@Test
public void testTruncateTableFailed() throws Exception {
String createTableStr = "create table internal.test.tbl2(d1 date, k1 int, k2 bigint)"
String createTableStr = "create table internal.testcommand.tbl2(d1 date, k1 int, k2 bigint)"
+ "duplicate key(d1, k1) "
+ "PARTITION BY RANGE(d1)"
+ "(PARTITION p20210901 VALUES [('2021-09-01'), ('2021-09-02')))"
+ "distributed by hash(k1) buckets 2 "
+ "properties('replication_num' = '1');";
createTable(createTableStr);
String partitionName = "p20210901";
Database db = Env.getCurrentInternalCatalog().getDbNullable("test");
Database db = Env.getCurrentInternalCatalog().getDbNullable("testcommand");
OlapTable tbl2 = db.getOlapTableOrDdlException("tbl2");
Assertions.assertNotNull(tbl2);

Expand All @@ -245,7 +248,7 @@ public void testTruncateTableFailed() throws Exception {
}

DebugPointUtil.addDebugPoint("InternalCatalog.truncateTable.metaChanged", new DebugPointUtil.DebugPoint());
String truncateStr = "truncate table internal.test.tbl2 partition (" + partitionName + ");";
String truncateStr = "truncate table internal.testcommand.tbl2 partition (" + partitionName + ");";

NereidsParser nereidsParser = new NereidsParser();
LogicalPlan plan = nereidsParser.parseSingle(truncateStr);
Expand Down