Skip to content

Commit 1db8673

Browse files
JackieTien97JackieTien97
committed
fix ci
1 parent 0d7adf6 commit 1db8673

File tree

2 files changed

+57
-27
lines changed

2 files changed

+57
-27
lines changed

‎integration-test/src/test/java/org/apache/iotdb/relational/it/query/object/IoTDBObjectQuery2IT.java‎

Lines changed: 55 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public void testReadObject() throws IoTDBConnectionException, StatementExecution
116116
Binary blob = iterator.getBlob(1);
117117
Assert.assertArrayEquals(expected, blob.getValues());
118118
}
119+
sessionDataSet.close();
119120

120121
sessionDataSet =
121122
session.executeQueryStatement(
@@ -126,6 +127,7 @@ public void testReadObject() throws IoTDBConnectionException, StatementExecution
126127
Binary blob = iterator.getBlob(1);
127128
Assert.assertArrayEquals(expected, blob.getValues());
128129
}
130+
sessionDataSet.close();
129131

130132
sessionDataSet =
131133
session.executeQueryStatement(
@@ -136,6 +138,7 @@ public void testReadObject() throws IoTDBConnectionException, StatementExecution
136138
Binary blob = iterator.getBlob(1);
137139
Assert.assertArrayEquals(expected, blob.getValues());
138140
}
141+
sessionDataSet.close();
139142

140143
sessionDataSet =
141144
session.executeQueryStatement(
@@ -145,6 +148,7 @@ public void testReadObject() throws IoTDBConnectionException, StatementExecution
145148
long count = iterator.getLong(1);
146149
Assert.assertEquals(10, count);
147150
}
151+
sessionDataSet.close();
148152

149153
// read_object are not pushed down. Read remote files
150154
sessionDataSet =
@@ -156,6 +160,7 @@ public void testReadObject() throws IoTDBConnectionException, StatementExecution
156160
Binary blob = iterator.getBlob(1);
157161
Assert.assertArrayEquals(expected, blob.getValues());
158162
}
163+
sessionDataSet.close();
159164
}
160165
}
161166

@@ -172,6 +177,8 @@ public void testFunctionAndClauses()
172177
while (iterator.next()) {
173178
Assert.assertEquals(4, iterator.getLong(1));
174179
}
180+
sessionDataSet.close();
181+
175182
sessionDataSet =
176183
session.executeQueryStatement(
177184
"select count(s8), first(s8), last(s8), first_by(s8, time), last_by(s8, time) from table1 where device = 'd1' and cast(s8 as string) = '(Object) 4 B' and try_cast(s8 as string) = '(Object) 4 B'");
@@ -183,12 +190,14 @@ public void testFunctionAndClauses()
183190
Assert.assertEquals("(Object) 4 B", iterator.getString(4));
184191
Assert.assertEquals("(Object) 4 B", iterator.getString(5));
185192
}
193+
sessionDataSet.close();
186194

187195
sessionDataSet = session.executeQueryStatement("select coalesce(s9, s8) from table1");
188196
iterator = sessionDataSet.iterator();
189197
while (iterator.next()) {
190198
Assert.assertEquals("(Object) 4 B", iterator.getString(1));
191199
}
200+
sessionDataSet.close();
192201

193202
// MATCH_RECOGNIZE
194203
Assert.assertThrows(
@@ -209,6 +218,7 @@ public void testFunctionAndClauses()
209218
while (iterator.next()) {
210219
Assert.assertEquals("(Object) 4 B", iterator.getString(1));
211220
}
221+
sessionDataSet.close();
212222

213223
// WHERE
214224
session.executeQueryStatement(
@@ -217,71 +227,90 @@ public void testFunctionAndClauses()
217227
while (iterator.next()) {
218228
Assert.assertEquals("(Object) 4 B", iterator.getString(2));
219229
}
230+
sessionDataSet.close();
220231

221232
// GROUP BY
222233
Assert.assertThrows(
223234
StatementExecutionException.class,
224-
() -> session.executeNonQueryStatement("select count(*) from table1 group by s8"));
235+
() -> session.executeQueryStatement("select count(*) from table1 group by s8"));
225236

226237
// ORDER BY
227238
Assert.assertThrows(
228239
StatementExecutionException.class,
229-
() -> session.executeNonQueryStatement("select count(*) from table1 order by s8"));
240+
() -> session.executeQueryStatement("select count(*) from table1 order by s8"));
230241

231242
// FILL
232-
Assert.assertThrows(
233-
StatementExecutionException.class,
234-
() ->
235-
session.executeNonQueryStatement(
236-
"select time, s8 from table1 where device = 'd10' fill method linear"));
237-
session.executeQueryStatement(
238-
"select time, s8 from table1 where device = 'd10' fill method previous");
243+
sessionDataSet =
244+
session.executeQueryStatement(
245+
"select time, s8 from table1 where device = 'd10' fill method linear");
246+
sessionDataSet.close();
247+
248+
sessionDataSet =
249+
session.executeQueryStatement(
250+
"select time, s8 from table1 where device = 'd10' fill method previous");
239251
iterator = sessionDataSet.iterator();
240252
while (iterator.next()) {
241253
Assert.assertEquals("(Object) 4 B", iterator.getString(2));
242254
}
255+
sessionDataSet.close();
243256

244257
// HAVING
245-
session.executeQueryStatement(
246-
"select device, count(s8) from table1 group by device having count(s8) > 0");
258+
sessionDataSet =
259+
session.executeQueryStatement(
260+
"select device, count(s8) from table1 group by device having count(s8) > 0");
247261
iterator = sessionDataSet.iterator();
248262
while (iterator.next()) {
249263
long count = iterator.getLong(2);
250264
Assert.assertEquals(10, count);
251265
}
266+
sessionDataSet.close();
252267

253268
// WINDOW
254269
Assert.assertThrows(
255270
StatementExecutionException.class,
256271
() ->
257-
session.executeNonQueryStatement(
272+
session.executeQueryStatement(
258273
"select *, nth_value(s8,2) over(partition by s8) from table1"));
259274
Assert.assertThrows(
260275
StatementExecutionException.class,
261276
() ->
262-
session.executeNonQueryStatement(
277+
session.executeQueryStatement(
263278
"select *, nth_value(s8,2) over(order by s8) from table1"));
264-
session.executeNonQueryStatement(
265-
"select *, nth_value(s8,2) over(partition by device) from table1");
266-
session.executeNonQueryStatement(
267-
"select *, lead(s8) over(partition by device order by time) from table1");
268-
session.executeNonQueryStatement(
269-
"select *, first_value(s8) over(partition by device) from table1");
270-
session.executeNonQueryStatement(
271-
"select *, last_value(s8) over(partition by device) from table1");
272-
session.executeNonQueryStatement(
273-
"select *, lag(s8) over(partition by device order by time) from table1");
279+
sessionDataSet =
280+
session.executeQueryStatement(
281+
"select *, nth_value(s8,2) over(partition by device) from table1");
282+
sessionDataSet.close();
283+
284+
sessionDataSet =
285+
session.executeQueryStatement(
286+
"select *, lead(s8) over(partition by device order by time) from table1");
287+
sessionDataSet.close();
288+
289+
sessionDataSet =
290+
session.executeQueryStatement(
291+
"select *, first_value(s8) over(partition by device) from table1");
292+
sessionDataSet.close();
293+
294+
sessionDataSet =
295+
session.executeQueryStatement(
296+
"select *, last_value(s8) over(partition by device) from table1");
297+
sessionDataSet.close();
298+
299+
sessionDataSet =
300+
session.executeQueryStatement(
301+
"select *, lag(s8) over(partition by device order by time) from table1");
302+
sessionDataSet.close();
274303

275304
// Table-value function
276305
Assert.assertThrows(
277306
StatementExecutionException.class,
278307
() ->
279-
session.executeNonQueryStatement(
308+
session.executeQueryStatement(
280309
"select * from session(data => table1 partition by s8, timecol => 'time', gap => 1ms)"));
281310
Assert.assertThrows(
282311
StatementExecutionException.class,
283312
() ->
284-
session.executeNonQueryStatement(
313+
session.executeQueryStatement(
285314
"select * from session(data => table1 order by s8, timecol => 'time', gap => 1ms)"));
286315
sessionDataSet =
287316
session.executeQueryStatement(
@@ -291,6 +320,7 @@ public void testFunctionAndClauses()
291320
String str = iterator.getString("s8");
292321
Assert.assertEquals("(Object) 4 B", str);
293322
}
323+
sessionDataSet.close();
294324
}
295325
}
296326
}

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/ReadObject3ColumnTransformer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public class ReadObject3ColumnTransformer extends TernaryColumnTransformer {
3535
private final Optional<FragmentInstanceContext> fragmentInstanceContext;
3636

3737
public ReadObject3ColumnTransformer(
38-
Type retuenType,
38+
Type returnType,
3939
ColumnTransformer firstColumnTransformer,
4040
ColumnTransformer secondColumnTransformer,
4141
ColumnTransformer thirdColumnTransformer,
4242
Optional<FragmentInstanceContext> fragmentInstanceContext) {
43-
super(retuenType, firstColumnTransformer, secondColumnTransformer, thirdColumnTransformer);
43+
super(returnType, firstColumnTransformer, secondColumnTransformer, thirdColumnTransformer);
4444
this.fragmentInstanceContext = fragmentInstanceContext;
4545
}
4646

0 commit comments

Comments
 (0)