Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions be/src/runtime/memory/mem_tracker_limiter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ MemTrackerLimiter::~MemTrackerLimiter() {
std::string err_msg = fmt::format(
"mem tracker label: {}, consumption: {}, peak consumption: {}, {}.", label(),
consumption(), peak_consumption(), mem_tracker_inaccurate_msg);
LOG(FATAL) << err_msg << print_address_sanitizers();
LOG(INFO) << err_msg << print_address_sanitizers();
}
if (ExecEnv::tracking_memory()) {
ExecEnv::GetInstance()->orphan_mem_tracker()->consume(consumption());
Expand All @@ -124,11 +124,11 @@ MemTrackerLimiter::~MemTrackerLimiter() {
// orphan memory tracker first to help us debug.
LOG(INFO) << "Orphan memory tracker consumption: "
<< ExecEnv::GetInstance()->orphan_mem_tracker()->print_address_sanitizers();
LOG(FATAL) << "[Address Sanitizer] consumption is 0, but address sanitizers not empty. "
<< ", mem tracker label: " << _label
<< ", peak consumption: " << peak_consumption() << print_address_sanitizers();
LOG(INFO) << "[Address Sanitizer] consumption is 0, but address sanitizers not empty. "
<< ", mem tracker label: " << _label
<< ", peak consumption: " << peak_consumption() << print_address_sanitizers();
}
DCHECK_EQ(reserved_consumption(), 0);
//DCHECK_EQ(reserved_consumption(), 0);
memory_memtrackerlimiter_cnt << -1;
}

Expand Down
11 changes: 0 additions & 11 deletions fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,13 @@
import org.apache.doris.common.util.TimeUtils;
import org.apache.doris.common.util.Util;
import org.apache.doris.nereids.StatementContext;
import org.apache.doris.nereids.analyzer.UnboundResultSink;
import org.apache.doris.nereids.glue.LogicalPlanAdapter;
import org.apache.doris.nereids.metrics.Event;
import org.apache.doris.nereids.metrics.EventSwitchParser;
import org.apache.doris.nereids.parser.Dialect;
import org.apache.doris.nereids.rules.RuleType;
import org.apache.doris.nereids.rules.exploration.mv.PreMaterializedViewRewriter.PreRewriteStrategy;
import org.apache.doris.nereids.rules.expression.ExpressionRuleType;
import org.apache.doris.nereids.trees.plans.commands.insert.InsertIntoTableCommand;
import org.apache.doris.nereids.trees.plans.logical.LogicalFileSink;
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
import org.apache.doris.planner.GroupCommitBlockSink;
import org.apache.doris.qe.VariableMgr.VarAttr;
import org.apache.doris.thrift.TGroupCommitMode;
Expand Down Expand Up @@ -4431,13 +4427,6 @@ public static boolean canUseNereidsDistributePlanner() {
if (!(parsedStatement instanceof LogicalPlanAdapter)) {
return false;
}
LogicalPlan logicalPlan = ((LogicalPlanAdapter) parsedStatement).getLogicalPlan();
// TODO: support other sink
if (!(logicalPlan instanceof UnboundResultSink
|| logicalPlan instanceof LogicalFileSink
|| logicalPlan instanceof InsertIntoTableCommand)) {
return false;
}
}
return sessionVariable.enableNereidsDistributePlanner;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2012,6 +2012,7 @@ private HttpStreamParams generateHttpStreamNereidsPlan(TUniqueId queryId) {
Preconditions.checkState(parsedStmt instanceof LogicalPlanAdapter,
"Nereids only process LogicalPlanAdapter, but parsedStmt is " + parsedStmt.getClass().getName());
context.getState().setNereids(true);
context.getStatementContext().setParsedStatement(parsedStmt);
InsertIntoTableCommand insert = (InsertIntoTableCommand) ((LogicalPlanAdapter) parsedStmt).getLogicalPlan();

try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.DatabaseIf;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.EnvFactory;
import org.apache.doris.catalog.MaterializedIndex;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Partition;
Expand Down Expand Up @@ -2163,7 +2164,8 @@ private HttpStreamParams initHttpStreamPlan(TStreamLoadPutRequest request, Conne
StmtExecutor executor = new StmtExecutor(ctx, originStmt);
httpStreamParams = executor.generateHttpStreamPlan(ctx.queryId());

Coordinator coord = new Coordinator(ctx, executor.planner());
Coordinator coord = EnvFactory.getInstance()
.createCoordinator(ctx, executor.planner(), ctx.getStatsErrorEstimator());
coord.setLoadMemLimit(request.getExecMemLimit());
coord.setQueryType(TQueryType.LOAD);
TableIf table = httpStreamParams.getTable();
Expand Down
Loading