prepare 0.48.9-public

Author: dingxin-tech

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.48.9-public] - 2024-10-11
+
+### Fixes
+- **TableAPI** Fixed an issue where `ArrayRecord` could not correctly invoke `toString` when using `SplitRecordReaderImpl` to retrieve results.
+- **TableAPI** Fixed an issue where a `get` operation would throw an array index out of bounds exception when the number of `Records` corresponding to a `Split` is 0 while using `SplitRecordReaderImpl` to retrieve results.
+- **TableAPI** Fixed an issue with composite predicates `CompositePredicate` that could lead to an additional operator being added when encountering an empty predicate.
+
 ## [0.48.8-public] - 2024-08-12
 
 ### Enhancement

CHANGELOG_CN.md

@@ -1,4 +1,15 @@
 # 更新日志
+
+## [0.48.9-public] - 2024-10-11
+
+### 修复
+
+-  **TableAPI** 修复了使用`SplitRecordReaderImpl`获取结果时，拿到了`ArrayRecord`无法正确`toString`的问题。
+-  **TableAPI** 修复了使用`SplitRecordReaderImpl`获取结果时，如果`Split`对应的`Record`数量为0，在`get`
+   操作时会抛出数组越界异常的问题。
+-  **TableAPI** 修复了复合谓词`CompositePredicate`在遇到空谓词时，可能额外增加一次操作符的问题。
+
+
 ## [0.48.8-public] - 2024-08-12
 ### 增强
 - 引入了对复合谓词表达式的内部验证，修复了处理无效或总是真/假谓词时的逻辑，增强了测试覆盖，确保了在复杂查询优化中的稳定性和准确性。

odps-sdk/odps-sdk-table-api/src/main/java/com/aliyun/odps/table/optimizer/predicate/CompoundPredicate.java

@@ -101,18 +101,16 @@ public String toString() {
           continue;
         }
       }
+      if (sb.length() != 0) {
+        sb.append(" ").append(opStr).append(" ");
+      }
       if (currentPredicate instanceof CompoundPredicate
           && ((CompoundPredicate) currentPredicate).logicalOperator != this.logicalOperator) {
         sb.append('(').append(currentPredicate).append(')');
       } else {
         sb.append(currentPredicate.toString());
       }
-
-      if (i < predicates.size() - 1) {
-        sb.append(" ").append(opStr).append(" ");
-      }
     }
-
     return sb.toString();
   }
 }

odps-sdk/odps-sdk-table-api/src/main/java/com/aliyun/odps/table/read/impl/batch/SplitRecordReaderImpl.java

@@ -19,16 +19,17 @@
 
 package com.aliyun.odps.table.read.impl.batch;
 
+import java.io.IOException;
+
+import org.apache.arrow.vector.VectorSchemaRoot;
+
 import com.aliyun.odps.Column;
 import com.aliyun.odps.data.ArrayRecord;
 import com.aliyun.odps.table.DataSchema;
 import com.aliyun.odps.table.configuration.ReaderOptions;
 import com.aliyun.odps.table.metrics.Metrics;
 import com.aliyun.odps.table.read.SplitReader;
 import com.aliyun.odps.table.record.ColumnarBatchRecord;
-import org.apache.arrow.vector.VectorSchemaRoot;
-
-import java.io.IOException;
 
 public class SplitRecordReaderImpl implements SplitReader<ArrayRecord> {
 
@@ -51,15 +52,19 @@ public SplitRecordReaderImpl(SplitReader<VectorSchemaRoot> arrowReader,
 
     @Override
     public boolean hasNext() throws IOException {
-        if (nextRow >= rowsInBatch) {
-            boolean moreRows = arrowBatchReader.hasNext();
+        if (nextRow < rowsInBatch) {
+            return true;
+        }
+        nextRow = 0;
+        boolean moreRows;
+        do {
+            moreRows = arrowBatchReader.hasNext();
             if (moreRows) {
-                nextRow = 0;
                 rowsInBatch = fillRows();
             }
-            return moreRows;
-        }
-        return true;
+            // If we filled rows, we can break out of the loop
+        } while (moreRows && rowsInBatch == 0);
+        return moreRows;
     }
 
     @Override

odps-sdk/odps-sdk-table-api/src/main/java/com/aliyun/odps/table/record/ColumnarBatchRecord.java

@@ -19,22 +19,22 @@
 
 package com.aliyun.odps.table.record;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.Schema;
+
 import com.aliyun.odps.Column;
 import com.aliyun.odps.data.AbstractChar;
 import com.aliyun.odps.data.ArrayRecord;
 import com.aliyun.odps.data.Binary;
 import com.aliyun.odps.data.Record;
 import com.aliyun.odps.table.arrow.accessor.ArrowVectorAccessor;
 import com.aliyun.odps.table.record.accessor.ArrowToRecordConverter;
-import org.apache.arrow.vector.FieldVector;
-import org.apache.arrow.vector.VectorSchemaRoot;
-import org.apache.arrow.vector.types.pojo.Field;
-import org.apache.arrow.vector.types.pojo.Schema;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 public class ColumnarBatchRecord extends ArrayRecord {
 
@@ -206,4 +206,23 @@ private int getColumnIndex(String name) {
         }
         return idx;
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        for (int index = 0; index < getColumnCount(); index++) {
+            Object o = get(index);
+            if (o == null) {
+                sb.append("null").append(",");
+            } else if (o instanceof byte[]) {
+                sb.append(bytesToString((byte[]) o)).append(",");
+            } else {
+                sb.append(o).append(",");
+            }
+        }
+        if (sb.length() > 0) {
+            sb.setLength(sb.length() - 1);
+        }
+        return sb.toString();
+    }
 }