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

[fix](test) should not create and read internal table when use mock cluster in UT (#21660)

Browse Source
This commit is contained in:
谢健
2023-07-21 11:30:26 +08:00
committed by GitHub
parent 0b2b1cbd58
commit b09c4d490a
6 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchemaInitializer.java
View File

@ -55,7 +55,7 @@ public class InternalSchemaInitializer extends Thread {
private static final Logger LOG = LogManager.getLogger(InternalSchemaInitializer.class);
public void run() {
if (FeConstants.disableInternalSchemaDb) {
if (!FeConstants.enableInternalSchemaDb) {
return;
}
while (!created()) {

4
fe/fe-core/src/main/java/org/apache/doris/common/FeConstants.java
View File

@ -50,8 +50,8 @@ public class FeConstants {
// set to true to skip some step when running FE unit test
public static boolean runningUnitTest = false;
// set to true to disable internal schema db
public static boolean disableInternalSchemaDb = false;
// set to false to disable internal schema db
public static boolean enableInternalSchemaDb = true;
// default scheduler interval is 10 seconds
public static int default_scheduler_interval_millisecond = 10000;

4
fe/fe-core/src/main/java/org/apache/doris/nereids/stats/StatsCalculator.java
View File

@ -23,6 +23,7 @@ import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.SchemaTable;
import org.apache.doris.catalog.TableIf;
import org.apache.doris.common.Config;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.Pair;
import org.apache.doris.nereids.CascadesContext;
import org.apache.doris.nereids.exceptions.AnalysisException;
@ -596,7 +597,8 @@ public class StatsCalculator extends DefaultPlanVisitor<Statistics, Void> {
if (colName == null) {
throw new RuntimeException(String.format("Invalid slot: %s", slotReference.getExprId()));
}
ColumnStatistic cache = Config.enable_stats ? getColumnStatistic(table, colName) : ColumnStatistic.UNKNOWN;
ColumnStatistic cache = Config.enable_stats && FeConstants.enableInternalSchemaDb
? getColumnStatistic(table, colName) : ColumnStatistic.UNKNOWN;
if (cache.avgSizeByte <= 0) {
cache = new ColumnStatisticBuilder(cache)
.setAvgSizeByte(slotReference.getColumn().get().getType().getSlotSize())

9
fe/fe-core/src/test/java/org/apache/doris/nereids/datasets/tpch/TPCHTestBase.java
View File

@ -17,18 +17,9 @@
package org.apache.doris.nereids.datasets.tpch;
import org.apache.doris.catalog.InternalSchemaInitializer;
import org.apache.doris.common.FeConstants;
public abstract class TPCHTestBase extends AnalyzeCheckTestBase {
@Override
protected void runBeforeAll() throws Exception {
// The internal table for TPCHTestBase is constructed in order to facilitate
// the execution of certain tests that require the invocation of a deriveStats job.
// This deriveStats job is responsible for retrieving statistics from the aforementioned
// internal table.
FeConstants.disableInternalSchemaDb = false;
new InternalSchemaInitializer().start();
createDatabase("tpch");
connectContext.setDatabase("default_cluster:tpch");
TPCHUtils.createTables(this);

4
fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
View File

@ -45,7 +45,6 @@ import org.apache.doris.analysis.UserIdentity;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.DiskInfo;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.InternalSchemaInitializer;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Replica;
import org.apache.doris.catalog.Table;
@ -129,12 +128,11 @@ public abstract class TestWithFeService {
@BeforeAll
public final void beforeAll() throws Exception {
FeConstants.disableInternalSchemaDb = true;
FeConstants.enableInternalSchemaDb = false;
beforeCreatingConnectContext();
connectContext = createDefaultCtx();
beforeCluster();
createDorisCluster();
new InternalSchemaInitializer().start();
runBeforeAll();
}

4
fe/fe-core/src/test/java/org/apache/doris/utframe/UtFrameUtils.java
View File

@ -210,7 +210,7 @@ public class UtFrameUtils {
public static void createDorisCluster(String runningDir, int backendNum) throws EnvVarNotSetException, IOException,
FeStartException, NotInitException, DdlException, InterruptedException {
FeConstants.disableInternalSchemaDb = true;
FeConstants.enableInternalSchemaDb = false;
int feRpcPort = startFEServer(runningDir);
List<Backend> bes = Lists.newArrayList();
for (int i = 0; i < backendNum; i++) {
@ -245,7 +245,7 @@ public class UtFrameUtils {
// set runningUnitTest to true, so that for ut,
// the agent task will be sent to "127.0.0.1" to make cluster running well.
FeConstants.runningUnitTest = true;
FeConstants.disableInternalSchemaDb = true;
FeConstants.enableInternalSchemaDb = false;
int feRpcPort = startFEServer(runningDir);
for (int i = 0; i < backendNum; i++) {
String host = "127.0.0." + (i + 1);