Skip to content

Commit ed7f4d7

Browse files
authored
Fix nested transformer close and move shared classes (#17642)
1 parent e4fc758 commit ed7f4d7

98 files changed

Lines changed: 194 additions & 293 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/ID.java renamed to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/schedule/queue/ID.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.iotdb.db.queryengine.execution.schedule.queue;
20+
package org.apache.iotdb.calc.execution.schedule.queue;
2121

2222
/** A simple interface to indicate the id type. */
2323
public interface ID {}

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IDIndexedAccessible.java renamed to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/schedule/queue/IDIndexedAccessible.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.iotdb.db.queryengine.execution.schedule.queue;
20+
package org.apache.iotdb.calc.execution.schedule.queue;
2121

2222
/**
2323
* A simple interface for id getter and setter.

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingQueue.java renamed to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/schedule/queue/IndexedBlockingQueue.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.iotdb.db.queryengine.execution.schedule.queue;
20+
package org.apache.iotdb.calc.execution.schedule.queue;
2121

2222
import com.google.common.base.Preconditions;
2323

@@ -166,7 +166,7 @@ public final synchronized int size() {
166166
*
167167
* @return true if the queue is empty, otherwise false.
168168
*/
169-
protected abstract boolean isEmpty();
169+
public abstract boolean isEmpty();
170170

171171
/**
172172
* Get and remove the first element.

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingReserveQueue.java renamed to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/schedule/queue/IndexedBlockingReserveQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.iotdb.db.queryengine.execution.schedule.queue;
20+
package org.apache.iotdb.calc.execution.schedule.queue;
2121

2222
import com.google.common.base.Preconditions;
2323

iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,4 +230,15 @@ protected abstract void writeToColumnBuilder(
230230
protected void checkType() {
231231
// do nothing
232232
}
233+
234+
@Override
235+
public void close() {
236+
super.close();
237+
for (Pair<ColumnTransformer, ColumnTransformer> whenThenColumnTransformer :
238+
whenThenTransformers) {
239+
whenThenColumnTransformer.left.close();
240+
whenThenColumnTransformer.right.close();
241+
}
242+
elseTransformer.close();
243+
}
233244
}

iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/BinaryColumnTransformer.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,11 @@ public void clearCache() {
9595
this.leftTransformer.clearCache();
9696
this.rightTransformer.clearCache();
9797
}
98+
99+
@Override
100+
public void close() {
101+
super.close();
102+
this.leftTransformer.close();
103+
this.rightTransformer.close();
104+
}
98105
}

iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/MappableUDFColumnTransformer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ public ColumnTransformer[] getInputColumnTransformers() {
8585

8686
@Override
8787
public void close() {
88+
super.close();
89+
for (ColumnTransformer inputColumnTransformer : inputColumnTransformers) {
90+
inputColumnTransformer.close();
91+
}
8892
// finalize executor
8993
executor.beforeDestroy();
9094
}

iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/MultiColumnTransformer.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,12 @@ public void clearCache() {
9696
columnTransformer.clearCache();
9797
}
9898
}
99+
100+
@Override
101+
public void close() {
102+
super.close();
103+
for (ColumnTransformer columnTransformer : columnTransformerList) {
104+
columnTransformer.close();
105+
}
106+
}
99107
}

iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/TernaryColumnTransformer.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,12 @@ public void clearCache() {
110110
secondColumnTransformer.clearCache();
111111
thirdColumnTransformer.clearCache();
112112
}
113+
114+
@Override
115+
public void close() {
116+
super.close();
117+
firstColumnTransformer.close();
118+
secondColumnTransformer.close();
119+
thirdColumnTransformer.close();
120+
}
113121
}

iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/UnaryColumnTransformer.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,10 @@ public void clearCache() {
7272
super.clearCache();
7373
childColumnTransformer.clearCache();
7474
}
75+
76+
@Override
77+
public void close() {
78+
super.close();
79+
childColumnTransformer.close();
80+
}
7581
}

0 commit comments

Comments
 (0)