Change in asterixdb[master]: Rename class: PushAggregateIntoGroupbyRule -> PushAggregateI...

[Yingyi Bu (Code Review)]

Yingyi Bu has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1162

Change subject: Rename class: PushAggregateIntoGroupbyRule -> 
PushAggregateIntoNestedSubplanRule.
......................................................................

Rename class: PushAggregateIntoGroupbyRule -> 
PushAggregateIntoNestedSubplanRule.

Change-Id: If700bb44e06267f61acdb976ada9066cc85455b6
---
M 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java
R 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushAggregateIntoNestedSubplanRule.java
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/62/1162/1

diff --git 
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java
 
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java
index 582cac9..c247b49 100644
--- 
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java
+++ 
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java
@@ -55,7 +55,7 @@
 import org.apache.asterix.optimizer.rules.MetaFunctionToMetaVariableRule;
 import org.apache.asterix.optimizer.rules.NestGroupByRule;
 import 
org.apache.asterix.optimizer.rules.PushAggFuncIntoStandaloneAggregateRule;
-import org.apache.asterix.optimizer.rules.PushAggregateIntoGroupbyRule;
+import org.apache.asterix.optimizer.rules.PushAggregateIntoNestedSubplanRule;
 import org.apache.asterix.optimizer.rules.PushFieldAccessRule;
 import org.apache.asterix.optimizer.rules.PushGroupByThroughProduct;
 import org.apache.asterix.optimizer.rules.PushLimitIntoOrderByRule;
@@ -212,7 +212,7 @@
         condPushDownAndJoinInference.add(new 
RemoveUnusedAssignAndAggregateRule());
 
         condPushDownAndJoinInference.add(new 
FactorRedundantGroupAndDecorVarsRule());
-        condPushDownAndJoinInference.add(new PushAggregateIntoGroupbyRule());
+        condPushDownAndJoinInference.add(new 
PushAggregateIntoNestedSubplanRule());
         condPushDownAndJoinInference.add(new EliminateSubplanRule());
         condPushDownAndJoinInference.add(new PushProperJoinThroughProduct());
         condPushDownAndJoinInference.add(new PushGroupByThroughProduct());
@@ -221,7 +221,7 @@
         condPushDownAndJoinInference.add(new PushSubplanIntoGroupByRule());
         condPushDownAndJoinInference.add(new NestedSubplanToJoinRule());
         condPushDownAndJoinInference.add(new 
EliminateSubplanWithInputCardinalityOneRule());
-        // The following rule should be fired after 
PushAggregateIntoGroupbyRule because
+        // The following rule should be fired after 
PushAggregateIntoNestedSubplanRule because
         // pulling invariants out of a subplan will make 
PushAggregateIntoGroupby harder.
         condPushDownAndJoinInference.add(new 
AsterixMoveFreeVariableOperatorOutOfSubplanRule());
 
diff --git 
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushAggregateIntoGroupbyRule.java
 
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushAggregateIntoNestedSubplanRule.java
similarity index 99%
rename from 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushAggregateIntoGroupbyRule.java
rename to 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushAggregateIntoNestedSubplanRule.java
index 168019b..b346417 100644
--- 
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushAggregateIntoGroupbyRule.java
+++ 
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushAggregateIntoNestedSubplanRule.java
@@ -54,7 +54,7 @@
 import org.apache.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil;
 import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
 
-public class PushAggregateIntoGroupbyRule implements IAlgebraicRewriteRule {
+public class PushAggregateIntoNestedSubplanRule implements 
IAlgebraicRewriteRule {
 
     @Override
     public boolean rewritePost(Mutable<ILogicalOperator> opRef, 
IOptimizationContext context) {
@@ -451,7 +451,7 @@
                             }
                             opRef1InSubplan = opRef2InSubplan;
                             if (opRef1InSubplan.getValue().getInputs().size() 
== 0) {
-                                throw new 
IllegalStateException("PushAggregateIntoGroupbyRule: could not find UNNEST.");
+                                throw new 
IllegalStateException("PushAggregateIntoNestedSubplanRule: could not find 
UNNEST.");
                             }
                         }
                     }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1162
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If700bb44e06267f61acdb976ada9066cc85455b6
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <buyin...@gmail.com>