Skip to content

Commit 1cad8ee

Browse files
branch-selectdb-doris-3.1: [fix](temp-table) not clean temp table temporary until fix mem leak apache#59535 (apache#6479)
cherry-picks from apache#59535 Related to apache#6477 Co-authored-by: morrySnow <[email protected]>
1 parent 0614e1f commit 1cad8ee

2 files changed

Lines changed: 38 additions & 41 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,8 @@ public void unregisterTempTable(Table table) {
875875
}
876876

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

881882
public void checkAndRefreshSession(String sessionId) {
@@ -7019,7 +7020,8 @@ private void replayJournalsAndExit() {
70197020
}
70207021

70217022
public void registerSessionInfo(String sessionId) {
7022-
this.aliveSessionSet.add(sessionId);
7023+
// TODO: do nothing now until we fix memory link on Env#sessionReportTimeMap and Env#aliveSessionSet
7024+
// this.aliveSessionSet.add(sessionId);
70237025
}
70247026

70257027
public void unregisterSessionInfo(String sessionId) {

‎fe/fe-core/src/main/java/org/apache/doris/catalog/TemporaryTableMgr.java‎

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,11 @@
1717

1818
package org.apache.doris.catalog;
1919

20-
import org.apache.doris.common.Config;
2120
import org.apache.doris.common.util.MasterDaemon;
22-
import org.apache.doris.common.util.Util;
2321

2422
import org.apache.logging.log4j.LogManager;
2523
import org.apache.logging.log4j.Logger;
2624

27-
import java.util.Collection;
28-
import java.util.Date;
29-
import java.util.Map;
30-
3125
/*
3226
* Delete temporary table when its creating session is gone
3327
*/
@@ -41,38 +35,39 @@ public TemporaryTableMgr() {
4135

4236
@Override
4337
protected void runAfterCatalogReady() {
44-
Map<String, Long> sessionReportTimeMap = Env.getCurrentEnv().getSessionReportTimeMap();
45-
long currentTs = System.currentTimeMillis();
46-
Collection<DatabaseIf<? extends TableIf>> internalDBs = Env.getCurrentEnv().getInternalCatalog().getAllDbs();
47-
for (DatabaseIf<? extends TableIf> db : internalDBs) {
48-
for (TableIf table : db.getTables()) {
49-
if (!table.isTemporary()) {
50-
continue;
51-
}
52-
53-
String sessionId = Util.getTempTableSessionId(table.getName());
54-
boolean needDelete = false;
55-
if (!sessionReportTimeMap.containsKey(sessionId)) {
56-
LOG.info("Cannot find session id for table " + table.getName());
57-
needDelete = true;
58-
} else if (currentTs > sessionReportTimeMap.get(sessionId)
59-
+ Config.loss_conn_fe_temp_table_keep_second * 1000) {
60-
LOG.info("Temporary table " + table.getName() + " is out of time: "
61-
+ new Date(sessionReportTimeMap.get(sessionId)) + ", current: " + new Date(currentTs));
62-
needDelete = true;
63-
}
64-
65-
if (needDelete) {
66-
LOG.info("Drop temporary table " + table);
67-
try {
68-
Env.getCurrentEnv().getInternalCatalog()
69-
.dropTableWithoutCheck((Database) db, (Table) table, false, true);
70-
} catch (Exception e) {
71-
LOG.error("Drop temporary table error: db: {}, table: {}",
72-
db.getFullName(), table.getName(), e);
73-
}
74-
}
75-
}
76-
}
38+
// TODO: do nothing now until we fix memory link on Env#sessionReportTimeMap and Env#aliveSessionSet
39+
// Map<String, Long> sessionReportTimeMap = Env.getCurrentEnv().getSessionReportTimeMap();
40+
// long currentTs = System.currentTimeMillis();
41+
// Collection<DatabaseIf<? extends TableIf>> internalDBs = Env.getCurrentEnv().getInternalCatalog().getAllDbs();
42+
// for (DatabaseIf<? extends TableIf> db : internalDBs) {
43+
// for (TableIf table : db.getTables()) {
44+
// if (!table.isTemporary()) {
45+
// continue;
46+
// }
47+
//
48+
// String sessionId = Util.getTempTableSessionId(table.getName());
49+
// boolean needDelete = false;
50+
// if (!sessionReportTimeMap.containsKey(sessionId)) {
51+
// LOG.info("Cannot find session id for table " + table.getName());
52+
// needDelete = true;
53+
// } else if (currentTs > sessionReportTimeMap.get(sessionId)
54+
// + Config.loss_conn_fe_temp_table_keep_second * 1000) {
55+
// LOG.info("Temporary table " + table.getName() + " is out of time: "
56+
// + new Date(sessionReportTimeMap.get(sessionId)) + ", current: " + new Date(currentTs));
57+
// needDelete = true;
58+
// }
59+
//
60+
// if (needDelete) {
61+
// LOG.info("Drop temporary table " + table);
62+
// try {
63+
// Env.getCurrentEnv().getInternalCatalog()
64+
// .dropTableWithoutCheck((Database) db, (Table) table, false, true);
65+
// } catch (Exception e) {
66+
// LOG.error("Drop temporary table error: db: {}, table: {}",
67+
// db.getFullName(), table.getName(), e);
68+
// }
69+
// }
70+
// }
71+
// }
7772
}
7873
}

0 commit comments

Comments
 (0)