Skip to content

Commit 081b28f

Browse files
committed
remove cleanUpCTE
1 parent dfd2ac3 commit 081b28f

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance;
4848
import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan;
4949
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil;
50-
import org.apache.iotdb.db.queryengine.plan.relational.planner.CteMaterializer;
5150
import org.apache.iotdb.db.queryengine.plan.scheduler.IScheduler;
5251
import org.apache.iotdb.db.utils.SetThreadName;
5352
import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceId;
@@ -350,9 +349,6 @@ private void releaseResource() {
350349
resultHandle.close();
351350
cleanUpResultHandle();
352351
}
353-
if (getSQLDialect().equals(IClientSession.SqlDialect.TABLE) && !context.isSubquery()) {
354-
CteMaterializer.getInstance().cleanUpCTE(context);
355-
}
356352
}
357353

358354
private void cleanUpResultHandle() {
@@ -396,9 +392,6 @@ private void releaseResource(Throwable t) {
396392
}
397393
cleanUpResultHandle();
398394
}
399-
if (getSQLDialect().equals(IClientSession.SqlDialect.TABLE) && !context.isSubquery()) {
400-
CteMaterializer.getInstance().cleanUpCTE(context);
401-
}
402395
}
403396

404397
/**

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan;
4040
import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance;
4141
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
42-
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef;
4342
import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema;
4443
import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema;
4544
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier;
@@ -99,16 +98,6 @@ public void materializeCTE(Analysis analysis, MPPQueryContext context) {
9998
});
10099
}
101100

102-
public void cleanUpCTE(MPPQueryContext context) {
103-
Map<NodeRef<Table>, Query> cteQueries = context.getCteQueries();
104-
cteQueries.values().stream()
105-
.map(Query::getCteDataStore)
106-
.filter(java.util.Objects::nonNull)
107-
.distinct()
108-
.forEach(CteDataStore::clear);
109-
cteQueries.clear();
110-
}
111-
112101
public CteDataStore fetchCteQueryResult(
113102
MPPQueryContext context, Table table, Query query, With with) {
114103
final long queryId = sessionManager.requestQueryId();

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void testCteSubquery() throws IoTDBException {
8383
mockExecuteForTableModel();
8484

8585
String sql =
86-
"with cte1 as (select time, s1 from table1) select s1 from table1 "
86+
"with cte1 as (select time, s2 from table1) select s1 from table1 "
8787
+ "where s1 = (select s2 from cte1)";
8888

8989
LogicalQueryPlan logicalQueryPlan = planTester.createPlan(sql);

0 commit comments

Comments
 (0)