asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject incubator-asterixdb-hyracks git commit: Fix ASTERIXDB-1201
Date Tue, 15 Dec 2015 00:13:03 GMT
Repository: incubator-asterixdb-hyracks
Updated Branches:
  refs/heads/master ed5825da5 -> 3a88250d9


Fix ASTERIXDB-1201

The reason the nulls were hitting the bulk loader was because
the filter was always set to null. It seems to work fine when
it is passed in just as it is in IndexInsertDeletePOperator

Change-Id: I0fbfaeb8a98316f4d148285832ad31d991481e4b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/553
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <buyingyi@gmail.com>
Reviewed-by: Taewoo Kim <wangsaeu@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/commit/3a88250d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/tree/3a88250d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/diff/3a88250d

Branch: refs/heads/master
Commit: 3a88250d97ba1f4d6b983881a94b7a0a441ab9da
Parents: ed5825d
Author: Ian Maxon <imaxon@apache.org>
Authored: Mon Dec 14 14:56:43 2015 -0800
Committer: Ian Maxon <imaxon@apache.org>
Committed: Mon Dec 14 16:09:08 2015 -0800

----------------------------------------------------------------------
 .../operators/physical/IndexBulkloadPOperator.java        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/3a88250d/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/IndexBulkloadPOperator.java
----------------------------------------------------------------------
diff --git a/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/IndexBulkloadPOperator.java
b/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/IndexBulkloadPOperator.java
index ff23703..15144ab 100644
--- a/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/IndexBulkloadPOperator.java
+++ b/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/IndexBulkloadPOperator.java
@@ -59,7 +59,7 @@ public class IndexBulkloadPOperator extends AbstractPhysicalOperator {
     private final List<LogicalVariable> primaryKeys;
     private final List<LogicalVariable> secondaryKeys;
     private final List<LogicalVariable> additionalFilteringKeys;
-    private final Mutable<ILogicalExpression> filterExpr;
+    private final ILogicalExpression filterExpr;
     private final IDataSourceIndex<?, ?> dataSourceIndex;
 
     public IndexBulkloadPOperator(List<LogicalVariable> primaryKeys, List<LogicalVariable>
secondaryKeys,
@@ -68,7 +68,11 @@ public class IndexBulkloadPOperator extends AbstractPhysicalOperator {
         this.primaryKeys = primaryKeys;
         this.secondaryKeys = secondaryKeys;
         this.additionalFilteringKeys = additionalFilteringKeys;
-        this.filterExpr = filterExpr;
+        if (filterExpr != null) {
+            this.filterExpr = filterExpr.getValue();
+        } else {
+            this.filterExpr = null;
+        }
         this.dataSourceIndex = dataSourceIndex;
     }
 
@@ -124,7 +128,7 @@ public class IndexBulkloadPOperator extends AbstractPhysicalOperator {
                 context.getTypeEnvironment(op.getInputs().get(0).getValue()), inputSchemas[0],
context);
         Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> runtimeAndConstraints
= mp.getIndexInsertRuntime(
                 dataSourceIndex, propagatedSchema, inputSchemas, typeEnv, primaryKeys, secondaryKeys,
-                additionalFilteringKeys, null, inputDesc, context, spec, true);
+                additionalFilteringKeys, filterExpr, inputDesc, context, spec, true);
         builder.contributeHyracksOperator(indexInsertDeleteOp, runtimeAndConstraints.first);
         builder.contributeAlgebricksPartitionConstraint(runtimeAndConstraints.first, runtimeAndConstraints.second);
         ILogicalOperator src = indexInsertDeleteOp.getInputs().get(0).getValue();


Mime
View raw message