You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2014/01/17 07:45:37 UTC
svn commit: r1559029 - in
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules:
./ util/
Author: prestonc
Date: Fri Jan 17 06:45:36 2014
New Revision: 1559029
URL: http://svn.apache.org/r1559029
Log:
Implemented a more generic method of working with aggregate expressions.
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java?rev=1559029&r1=1559028&r2=1559029&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractVXQueryAggregateRule.java Fri Jan 17 06:45:36 2014
@@ -16,71 +16,14 @@
*/
package org.apache.vxquery.compiler.rewriter.rules;
-import org.apache.commons.lang3.mutable.Mutable;
import org.apache.vxquery.functions.BuiltinFunctions;
-import org.apache.vxquery.functions.BuiltinOperators;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
public abstract class AbstractVXQueryAggregateRule implements IAlgebraicRewriteRule {
- protected AbstractFunctionCallExpression getAggregateLastFunctionCall(IFunctionInfo aggregateInfo,
- AbstractFunctionCallExpression functionCall) {
- if (aggregateInfo.equals(BuiltinFunctions.FN_COUNT_1)) {
- // Argument for count is "item()*"
- // If the first argument is treat, allow it to pass.
- ILogicalExpression logicalExpression2 = (ILogicalExpression) functionCall.getArguments().get(0).getValue();
- if (logicalExpression2.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
- return null;
- }
- AbstractFunctionCallExpression functionCall2 = (AbstractFunctionCallExpression) logicalExpression2;
- if (!functionCall2.getFunctionIdentifier().equals(BuiltinOperators.TREAT.getFunctionIdentifier())) {
- return null;
- }
-
- // find variable id for argument to count.
- Mutable<ILogicalExpression> mutableLogicalExpression3 = functionCall2.getArguments().get(0);
- ILogicalExpression logicalExpression3 = (ILogicalExpression) mutableLogicalExpression3.getValue();
- if (logicalExpression3.getExpressionTag() != LogicalExpressionTag.VARIABLE) {
- return null;
- }
- return functionCall2;
- } else {
- // Argument for these aggregate is "xs:anyAtomicType*"
- // If the first argument is promote followed by data, allow it to pass.
- ILogicalExpression logicalExpression2 = (ILogicalExpression) functionCall.getArguments().get(0).getValue();
- if (logicalExpression2.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
- return null;
- }
- AbstractFunctionCallExpression functionCall2 = (AbstractFunctionCallExpression) logicalExpression2;
- if (!functionCall2.getFunctionIdentifier().equals(BuiltinOperators.PROMOTE.getFunctionIdentifier())) {
- return null;
- }
-
- // If the first argument is promote followed by data, allow it to pass.
- ILogicalExpression logicalExpression3 = (ILogicalExpression) functionCall2.getArguments().get(0).getValue();
- if (logicalExpression3.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
- return null;
- }
- AbstractFunctionCallExpression functionCall3 = (AbstractFunctionCallExpression) logicalExpression3;
- if (!functionCall3.getFunctionIdentifier().equals(BuiltinFunctions.FN_DATA_1.getFunctionIdentifier())) {
- return null;
- }
-
- // find variable id for argument to the aggregate function.
- Mutable<ILogicalExpression> mutableLogicalExpression4 = functionCall3.getArguments().get(0);
- ILogicalExpression logicalExpression4 = (ILogicalExpression) mutableLogicalExpression4.getValue();
- if (logicalExpression4.getExpressionTag() != LogicalExpressionTag.VARIABLE) {
- return null;
- }
- return functionCall3;
- }
- }
-
protected IFunctionInfo getAggregateFunction(AbstractFunctionCallExpression functionCall) {
if (functionCall.getFunctionIdentifier().equals(BuiltinFunctions.FN_COUNT_1.getFunctionIdentifier())) {
return BuiltinFunctions.FN_COUNT_1;
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java?rev=1559029&r1=1559028&r2=1559029&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateAssignAggregateRule.java Fri Jan 17 06:45:36 2014
@@ -19,6 +19,7 @@ package org.apache.vxquery.compiler.rewr
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.vxquery.compiler.algebricks.VXQueryConstantValue;
+import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.types.BuiltinTypeRegistry;
@@ -103,17 +104,20 @@ public class ConsolidateAssignAggregateR
return false;
}
AbstractFunctionCallExpression functionCall = (AbstractFunctionCallExpression) logicalExpression;
+ // TODO Use the function definition
aggregateInfo = getAggregateFunction(functionCall);
if (aggregateInfo == null) {
return false;
}
- finalFunctionCall = getAggregateLastFunctionCall(aggregateInfo, functionCall);
- if (finalFunctionCall == null) {
+ mutableVariableExpresion = ExpressionToolbox.findVariableExpression(mutableLogicalExpression);
+ if (mutableVariableExpresion == null) {
return false;
}
+ Mutable<ILogicalExpression> finalFunctionCallM = ExpressionToolbox
+ .findLastFunctionExpression(mutableLogicalExpression);
+ finalFunctionCall = (AbstractFunctionCallExpression) finalFunctionCallM.getValue();
// Variable details.
- mutableVariableExpresion = finalFunctionCall.getArguments().get(0);
VariableReferenceExpression variableReference = (VariableReferenceExpression) mutableVariableExpresion
.getValue();
int variableId = variableReference.getVariableReference().getId();
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java?rev=1559029&r1=1559028&r2=1559029&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignToAggregateRule.java Fri Jan 17 06:45:36 2014
@@ -21,6 +21,7 @@ import java.util.List;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
+import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
import org.apache.vxquery.functions.BuiltinOperators;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -99,15 +100,20 @@ public class ConvertAssignToAggregateRul
return false;
}
AbstractFunctionCallExpression functionCall = (AbstractFunctionCallExpression) logicalExpression;
+ // TODO get the function through the function definition
aggregateInfo = getAggregateFunction(functionCall);
if (aggregateInfo == null) {
return false;
}
- finalFunctionCall = getAggregateLastFunctionCall(aggregateInfo, functionCall);
- if (finalFunctionCall == null) {
+ Mutable<ILogicalExpression> mutableVariableExpresion = ExpressionToolbox.findVariableExpression(mutableLogicalExpression);
+ if (mutableVariableExpresion == null) {
return false;
}
+ Mutable<ILogicalExpression> finalFunctionCallM = ExpressionToolbox
+ .findLastFunctionExpression(mutableLogicalExpression);
+ finalFunctionCall = (AbstractFunctionCallExpression) finalFunctionCallM.getValue();
+
// Build a subplan for replacing the sort distinct function with operators.
// Nested tuple source.
Mutable<ILogicalOperator> inputOperator = getInputOperator(assign.getInputs().get(0));
@@ -115,8 +121,7 @@ public class ConvertAssignToAggregateRul
nextOperatorRef = new MutableObject<ILogicalOperator>(ntsOperator);
// Get variable that is being used for sort and distinct operators.
- VariableReferenceExpression inputVariableRef = (VariableReferenceExpression) finalFunctionCall.getArguments()
- .get(0).getValue();
+ VariableReferenceExpression inputVariableRef = (VariableReferenceExpression) mutableVariableExpresion.getValue();
LogicalVariable inputVariable = inputVariableRef.getVariableReference();
// Unnest.
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java?rev=1559029&r1=1559028&r2=1559029&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java Fri Jan 17 06:45:36 2014
@@ -69,6 +69,25 @@ public class ExpressionToolbox {
return null;
}
+ public static Mutable<ILogicalExpression> findLastFunctionExpression(Mutable<ILogicalExpression> mutableLe) {
+ ILogicalExpression le = mutableLe.getValue();
+ if (le.getExpressionTag() == LogicalExpressionTag.VARIABLE) {
+ return null;
+ } else if (le.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL) {
+ AbstractFunctionCallExpression afce = (AbstractFunctionCallExpression) le;
+ for (Mutable<ILogicalExpression> argExp : afce.getArguments()) {
+ if (argExp.getValue().getExpressionTag() == LogicalExpressionTag.VARIABLE) {
+ return mutableLe;
+ }
+ Mutable<ILogicalExpression> resultLe = findLastFunctionExpression(argExp);
+ if (resultLe != null) {
+ return resultLe;
+ }
+ }
+ }
+ return null;
+ }
+
public static Mutable<ILogicalExpression> findFunctionExpression(Mutable<ILogicalExpression> mutableLe,
FunctionIdentifier fi) {
ILogicalExpression le = mutableLe.getValue();