diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java index c796a59453750c..443aa94dc6f871 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java @@ -2957,7 +2957,7 @@ public class Config extends ConfigBase { "Whether to advance the ID generator after becoming Master to ensure that the id " + "generator will not be rolled back even when metadata is rolled back." }) - public static boolean enable_advance_next_id = false; + public static boolean enable_advance_next_id = true; // The count threshold to do manual GC when doing checkpoint but not enough memory. // Set zero to disable it. diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ExportToOutfileLogicalPlanTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ExportToOutfileLogicalPlanTest.java index 43256a14a13020..096868276fdd7f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ExportToOutfileLogicalPlanTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ExportToOutfileLogicalPlanTest.java @@ -17,6 +17,7 @@ package org.apache.doris.analysis; +import org.apache.doris.common.Config; import org.apache.doris.common.FeConstants; import org.apache.doris.common.UserException; import org.apache.doris.load.ExportJob; @@ -47,6 +48,12 @@ public class ExportToOutfileLogicalPlanTest extends TestWithFeService { private String dbName = "testDb"; private String tblName = "table1"; + private final boolean defaultEnableAdvanceNextId = Config.enable_advance_next_id; // backup + + { + enableAdvanceNextId = false; + } + /** * create a database and a table * @@ -65,6 +72,7 @@ protected void runBeforeAll() throws Exception { + "PARTITION p4 VALUES LESS THAN (\"50\")\n" + ")\n" + " distributed by hash(k1) buckets 10\n" + "properties(\"replication_num\" = \"1\");"); + Config.enable_advance_next_id = defaultEnableAdvanceNextId; // restore } /** diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexesProcNodeTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexesProcNodeTest.java index 966f6c38b5b783..273915a2d20317 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexesProcNodeTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexesProcNodeTest.java @@ -96,7 +96,7 @@ public void testFetchResult() throws AnalysisException { Assert.assertEquals(procResult.getRows().get(3).get(5), "col_4"); Assert.assertEquals(procResult.getRows().get(3).get(11), "NGRAM_BF"); Assert.assertEquals(procResult.getRows().get(3).get(12), "ngram_bf index on col_4"); - Assert.assertEquals(procResult.getRows().get(3).get(13), "(\"gram_size\" = \"3\", \"bf_size\" = \"256\")"); + Assert.assertEquals(procResult.getRows().get(3).get(13), "(\"bf_size\" = \"256\", \"gram_size\" = \"3\")"); } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/service/FrontendServiceImplTest.java b/fe/fe-core/src/test/java/org/apache/doris/service/FrontendServiceImplTest.java index e145b0c688048b..715a96c236b14b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/service/FrontendServiceImplTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/service/FrontendServiceImplTest.java @@ -55,6 +55,7 @@ import org.junit.rules.ExpectedException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.UUID; @@ -231,8 +232,10 @@ public void testGetDBNames() throws Exception { TGetDbsResult dbNames = impl.getDbNames(params); Assert.assertEquals(dbNames.getDbs().size(), 2); - Assert.assertTrue(dbNames.getDbs().contains("test")); - Assert.assertTrue(dbNames.getDbs().contains("test_")); + List expected = Arrays.asList("test", "test_"); + dbNames.getDbs().sort(String::compareTo); + expected.sort(String::compareTo); + Assert.assertEquals(dbNames.getDbs(), expected); } @Test diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java index 70adbbd7f99f5e..c24703bf6f6fa3 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java +++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java @@ -140,6 +140,8 @@ public abstract class TestWithFeService { protected ConnectContext connectContext; protected boolean needCleanDir = true; protected int lastFeRpcPort = 0; + // make it default to enable_advance_next_id + protected boolean enableAdvanceNextId = Config.enable_advance_next_id; protected static final String DEFAULT_CLUSTER_PREFIX = ""; @@ -152,6 +154,8 @@ public Set getEnableNereidsRules() { @BeforeAll public final void beforeAll() throws Exception { + // this.enableAdvanceNextId may be reset by children classes + Config.enable_advance_next_id = this.enableAdvanceNextId; FeConstants.enableInternalSchemaDb = false; FeConstants.shouldCreateInternalWorkloadGroup = false; beforeCreatingConnectContext();