Merge pull request #49 from Jutao-liu/main

fix agg partial pushDown issue
kunpengcompute · Jun 13, 2022 · 2a19c3d · 2a19c3d
2 parents 88a39b9 + adfd369
commit 2a19c3d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.../connector/src/main/java/org/apache/hadoop/hive/ql/omnidata/physical/NdpPlanResolver.java b/.../connector/src/main/java/org/apache/hadoop/hive/ql/omnidata/physical/NdpPlanResolver.java
@@ -205,6 +205,10 @@ public Object dispatch(Node nd, Stack<Node> stack, Object... nodeOutputs) throws
                         // get OmniData filter expression
                         if (isPushDownFilter) {
                             filter = getOmniDataFilter(omniDataPredicate);
+                            if (!filter.isPresent()) {
+                                isPushDownFilter = false;
+                                isPushDownAgg = false;
+                            }
                         }
                         // get OmniData agg expression
                         if (isPushDownAgg) {
@@ -304,15 +308,13 @@ private Optional<RowExpression> getOmniDataFilter(OmniDataPredicate omniDataPred
                 // The AGG does not support part push down
                 isPushDownAgg = false;
             } else if (mode.equals(NdpFilter.NdpFilterMode.NONE)) {
-                isPushDownFilter = false;
                 return Optional.empty();
             }
             OmniDataFilter omniDataFilter = new OmniDataFilter(omniDataPredicate);
             // ExprNodeGenericFuncDesc need to clone
             RowExpression filterRowExpression = omniDataFilter.getFilterExpression(
                     (ExprNodeGenericFuncDesc) filterDesc.clone(), ndpFilter);
             if (filterRowExpression == null) {
-                isPushDownFilter = false;
                 return Optional.empty();
             }
             return Optional.of(filterRowExpression);