Skip empty TsBlocks in operator tests

Author: Caideyipi

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java

@@ -65,6 +65,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext;
+import static org.apache.iotdb.db.queryengine.execution.operator.OperatorTestUtils.isNullOrEmpty;
 import static org.apache.iotdb.db.queryengine.execution.operator.OperatorTestUtils.nextNonNull;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -383,11 +384,11 @@ public void batchTest3() throws Exception {
           new OffsetOperator(driverContext.getOperatorContexts().get(3), 500, timeJoinOperator);
 
       while (offsetOperator.isBlocked().isDone() && offsetOperator.hasNext()) {
-        TsBlock tsBlock = nextNonNull(offsetOperator);
-        assertEquals(2, tsBlock.getValueColumnCount());
-        assertTrue(tsBlock.getColumn(0) instanceof IntColumn);
-        assertTrue(tsBlock.getColumn(1) instanceof IntColumn);
-        assertEquals(0, tsBlock.getPositionCount());
+        TsBlock tsBlock = offsetOperator.next();
+        if (isNullOrEmpty(tsBlock)) {
+          continue;
+        }
+        fail("Expected no data from offset operator");
       }
     } catch (IllegalPathException e) {
       e.printStackTrace();
@@ -475,11 +476,11 @@ public void batchTest4() throws Exception {
               driverContext.getOperatorContexts().get(3), 98_784_247_808L, timeJoinOperator);
 
       while (offsetOperator.isBlocked().isDone() && offsetOperator.hasNext()) {
-        TsBlock tsBlock = nextNonNull(offsetOperator);
-        assertEquals(2, tsBlock.getValueColumnCount());
-        assertTrue(tsBlock.getColumn(0) instanceof IntColumn);
-        assertTrue(tsBlock.getColumn(1) instanceof IntColumn);
-        assertEquals(0, tsBlock.getPositionCount());
+        TsBlock tsBlock = offsetOperator.next();
+        if (isNullOrEmpty(tsBlock)) {
+          continue;
+        }
+        fail("Expected no data from offset operator");
       }
     } catch (IllegalPathException e) {
       e.printStackTrace();

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorTestUtils.java

@@ -31,21 +31,25 @@ private OperatorTestUtils() {
   public static TsBlock nextNonNull(Operator operator) throws Exception {
     while (operator.hasNext()) {
       TsBlock result = operator.next();
-      if (result != null) {
+      if (!isNullOrEmpty(result)) {
         return result;
       }
     }
-    throw new AssertionError("Expected a non-null TsBlock from operator");
+    throw new AssertionError("Expected a non-empty TsBlock from operator");
   }
 
   public static TsBlock lastNonNull(Operator operator) throws Exception {
     TsBlock result = null;
     while (operator.isBlocked().isDone() && operator.hasNext()) {
       TsBlock nextResult = operator.next();
-      if (nextResult != null) {
+      if (!isNullOrEmpty(nextResult)) {
         result = nextResult;
       }
     }
     return result;
   }
+
+  public static boolean isNullOrEmpty(TsBlock tsBlock) {
+    return tsBlock == null || tsBlock.getPositionCount() == 0;
+  }
 }