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

[fix](statistics)Release StmtExecutor in AnalysisTask object when sql execution finished to release memory. #31212

Browse Source
This commit is contained in:
Jibing-Li
2024-02-21 19:15:00 +08:00
committed by yiguolei
parent eaf22cf3d3
commit 6bbe6c9a59
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/statistics/BaseAnalysisTask.java
View File

@ -317,6 +317,8 @@ public abstract class BaseAnalysisTask {
LOG.debug("End cost time in millisec: " + (System.currentTimeMillis() - startTime)
+ " Analyze SQL: " + sql + " QueryId: " + queryId);
}
// Release the reference to stmtExecutor, reduce memory usage.
stmtExecutor = null;
}
}

14
fe/fe-core/src/main/java/org/apache/doris/statistics/OlapAnalysisTask.java
View File

@ -26,6 +26,7 @@ import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Partition;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.Pair;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.qe.AutoCloseConnectContext;
import org.apache.doris.qe.StmtExecutor;
import org.apache.doris.statistics.AnalysisInfo.JobType;
@ -183,14 +184,23 @@ public class OlapAnalysisTask extends BaseAnalysisTask {
tbl.getName(), col.getName());
return null;
}
long startTime = System.currentTimeMillis();
Map<String, String> params = new HashMap<>();
params.put("dbName", db.getFullName());
params.put("colName", StatisticsUtil.escapeColumnName(info.colName));
params.put("tblName", tbl.getName());
params.put("index", getIndex());
StringSubstitutor stringSubstitutor = new StringSubstitutor(params);
stmtExecutor = new StmtExecutor(context.connectContext, stringSubstitutor.replace(BASIC_STATS_TEMPLATE));
return stmtExecutor.executeInternalQuery().get(0);
String sql = stringSubstitutor.replace(BASIC_STATS_TEMPLATE);
stmtExecutor = new StmtExecutor(context.connectContext, sql);
ResultRow resultRow = stmtExecutor.executeInternalQuery().get(0);
if (LOG.isDebugEnabled()) {
LOG.debug("Cost time in millisec: " + (System.currentTimeMillis() - startTime)
+ " Min max SQL: " + sql + " QueryId: " + DebugUtil.printId(stmtExecutor.getContext().queryId()));
}
// Release the reference to stmtExecutor, reduce memory usage.
stmtExecutor = null;
return resultRow;
}
/**