database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](jni) remove 'push_down_predicates' and fix BE crash with decimal predicate (#32253) (#32599)

Browse Source
This commit is contained in:
Mingyu Chen
2024-03-21 13:48:51 +08:00
committed by yiguolei
parent a7fa9f290c
commit 4c8aaa156a
8 changed files with 29 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fe/be-java-extensions/java-common/src/main/java/org/apache/doris/common/jni/JniScanner.java
View File

@ -33,6 +33,14 @@ public abstract class JniScanner {
protected VectorTable vectorTable;
protected String[] fields;
protected ColumnType[] types;
@Deprecated
// This predicate is from BE, but no used.
// TODO: actually, we can generate the predicate for JNI scanner in FE's planner,
// then serialize it to BE, and BE pass it to JNI scanner directly.
// NO need to use this intermediate expression, because each JNI scanner has its
// own predicate expression format.
// For example, Paimon use "PaimonScannerUtils.decodeStringToObject(paimonPredicate)"
// to deserialize the predicate string to PaimonPredicate object.
protected ScanPredicate[] predicates;
protected int batchSize;
@ -50,11 +58,9 @@ public abstract class JniScanner {
throw new UnsupportedOperationException();
}
protected void initTableInfo(ColumnType[] requiredTypes, String[] requiredFields, ScanPredicate[] predicates,
int batchSize) {
protected void initTableInfo(ColumnType[] requiredTypes, String[] requiredFields, int batchSize) {
this.types = requiredTypes;
this.fields = requiredFields;
this.predicates = predicates;
this.batchSize = batchSize;
}

11
fe/be-java-extensions/java-common/src/main/java/org/apache/doris/common/jni/MockJniScanner.java
View File

@ -20,7 +20,6 @@ package org.apache.doris.common.jni;
import org.apache.doris.common.jni.vec.ColumnType;
import org.apache.doris.common.jni.vec.ColumnValue;
import org.apache.doris.common.jni.vec.ScanPredicate;
import org.apache.log4j.Logger;
@ -187,15 +186,7 @@ public class MockJniScanner extends JniScanner {
for (int i = 0; i < types.length; i++) {
columnTypes[i] = ColumnType.parseType(requiredFields[i], types[i]);
}
ScanPredicate[] predicates = new ScanPredicate[0];
if (params.containsKey("push_down_predicates")) {
long predicatesAddress = Long.parseLong(params.get("push_down_predicates"));
if (predicatesAddress != 0) {
predicates = ScanPredicate.parseScanPredicates(predicatesAddress, columnTypes);
LOG.info("MockJniScanner gets pushed-down predicates: " + ScanPredicate.dump(predicates));
}
}
initTableInfo(columnTypes, requiredFields, predicates, batchSize);
initTableInfo(columnTypes, requiredFields, batchSize);
}
@Override