Skip to content

branch-4.0: [fix](temp-table) not clean temp table temporary until fix mem leak #59535 #59551

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
yiguolei merged 1 commit into from
Jan 7, 2026
Merged

branch-4.0: [fix](temp-table) not clean temp table temporary until fix mem leak #59535 #59551

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
6 changes: 4 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,8 @@ public void unregisterTempTable(Table table) {
}

private void refreshSession(String sessionId) {
sessionReportTimeMap.put(sessionId, System.currentTimeMillis());
// TODO: do nothing now until we fix memory link on Env#sessionReportTimeMap and Env#aliveSessionSet
// sessionReportTimeMap.put(sessionId, System.currentTimeMillis());
}

public void checkAndRefreshSession(String sessionId) {
Expand Down Expand Up @@ -7359,7 +7360,8 @@ private void replayJournalsAndExit() {
}

public void registerSessionInfo(String sessionId) {
this.aliveSessionSet.add(sessionId);
// TODO: do nothing now until we fix memory link on Env#sessionReportTimeMap and Env#aliveSessionSet
// this.aliveSessionSet.add(sessionId);
}

public void unregisterSessionInfo(String sessionId) {
Expand Down
73 changes: 34 additions & 39 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/TemporaryTableMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,11 @@

package org.apache.doris.catalog;

import org.apache.doris.common.Config;
import org.apache.doris.common.util.MasterDaemon;
import org.apache.doris.common.util.Util;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.Collection;
import java.util.Date;
import java.util.Map;

/*
* Delete temporary table when its creating session is gone
*/
Expand All @@ -41,38 +35,39 @@ public TemporaryTableMgr() {

@Override
protected void runAfterCatalogReady() {
Map<String, Long> sessionReportTimeMap = Env.getCurrentEnv().getSessionReportTimeMap();
long currentTs = System.currentTimeMillis();
Collection<DatabaseIf<? extends TableIf>> internalDBs = Env.getCurrentEnv().getInternalCatalog().getAllDbs();
for (DatabaseIf<? extends TableIf> db : internalDBs) {
for (TableIf table : db.getTables()) {
if (!table.isTemporary()) {
continue;
}

String sessionId = Util.getTempTableSessionId(table.getName());
boolean needDelete = false;
if (!sessionReportTimeMap.containsKey(sessionId)) {
LOG.info("Cannot find session id for table " + table.getName());
needDelete = true;
} else if (currentTs > sessionReportTimeMap.get(sessionId)
+ Config.loss_conn_fe_temp_table_keep_second * 1000) {
LOG.info("Temporary table " + table.getName() + " is out of time: "
+ new Date(sessionReportTimeMap.get(sessionId)) + ", current: " + new Date(currentTs));
needDelete = true;
}

if (needDelete) {
LOG.info("Drop temporary table " + table);
try {
Env.getCurrentEnv().getInternalCatalog()
.dropTableWithoutCheck((Database) db, (Table) table, false, true);
} catch (Exception e) {
LOG.error("Drop temporary table error: db: {}, table: {}",
db.getFullName(), table.getName(), e);
}
}
}
}
// TODO: do nothing now until we fix memory link on Env#sessionReportTimeMap and Env#aliveSessionSet
// Map<String, Long> sessionReportTimeMap = Env.getCurrentEnv().getSessionReportTimeMap();
// long currentTs = System.currentTimeMillis();
// Collection<DatabaseIf<? extends TableIf>> internalDBs = Env.getCurrentEnv().getInternalCatalog().getAllDbs();
// for (DatabaseIf<? extends TableIf> db : internalDBs) {
// for (TableIf table : db.getTables()) {
// if (!table.isTemporary()) {
// continue;
// }
//
// String sessionId = Util.getTempTableSessionId(table.getName());
// boolean needDelete = false;
// if (!sessionReportTimeMap.containsKey(sessionId)) {
// LOG.info("Cannot find session id for table " + table.getName());
// needDelete = true;
// } else if (currentTs > sessionReportTimeMap.get(sessionId)
// + Config.loss_conn_fe_temp_table_keep_second * 1000) {
// LOG.info("Temporary table " + table.getName() + " is out of time: "
// + new Date(sessionReportTimeMap.get(sessionId)) + ", current: " + new Date(currentTs));
// needDelete = true;
// }
//
// if (needDelete) {
// LOG.info("Drop temporary table " + table);
// try {
// Env.getCurrentEnv().getInternalCatalog()
// .dropTableWithoutCheck((Database) db, (Table) table, false, true);
// } catch (Exception e) {
// LOG.error("Drop temporary table error: db: {}, table: {}",
// db.getFullName(), table.getName(), e);
// }
// }
// }
// }
}
}
Loading