You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ti...@apache.org on 2016/05/17 16:38:30 UTC
incubator-asterixdb git commit: fix typo
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master bba05b7bb -> 83197109f
fix typo
Change-Id: Iabd78359ae7cdb924a87444dd03968e6f428ab8e
Reviewed-on: https://asterix-gerrit.ics.uci.edu/786
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/83197109
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/83197109
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/83197109
Branch: refs/heads/master
Commit: 83197109fb81ff3d6c3f3fad4ceb8146fed89748
Parents: bba05b7
Author: Till Westmann <ti...@apache.org>
Authored: Mon May 16 09:41:38 2016 -0700
Committer: Till Westmann <ti...@apache.org>
Committed: Tue May 17 09:38:26 2016 -0700
----------------------------------------------------------------------
.../lang/common/rewrites/VariableSubstitutionEnvironment.java | 2 +-
.../common/visitor/CloneAndSubstituteVariablesVisitor.java | 4 ++--
.../lang/sqlpp/rewrites/visitor/InlineColumnAliasVisitor.java | 6 +++---
.../lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/83197109/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java
index b99b3b3..4c4767e 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java
@@ -46,7 +46,7 @@ public class VariableSubstitutionEnvironment {
oldVarToNewExpressionMap.putAll(varExprMap);
}
- public Expression findSubstituion(VariableExpr oldVar) {
+ public Expression findSubstitution(VariableExpr oldVar) {
return oldVarToNewExpressionMap.get(oldVar.getVar().getValue());
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/83197109/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java
index db55c0e..d380862 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java
@@ -156,7 +156,7 @@ public class CloneAndSubstituteVariablesVisitor extends
if (!env.constainsOldVar(varExpr)) {
throw new AsterixException("Parameter " + vi + " does not appear in the substitution list.");
}
- Expression newExpr = env.findSubstituion(varExpr);
+ Expression newExpr = env.findSubstitution(varExpr);
if (newExpr.getKind() != Kind.VARIABLE_EXPRESSION) {
throw new AsterixException("Parameter " + vi + " cannot be substituted by a non-variable expression.");
}
@@ -297,7 +297,7 @@ public class CloneAndSubstituteVariablesVisitor extends
protected Expression rewriteVariableExpr(VariableExpr expr, VariableSubstitutionEnvironment env)
throws AsterixException {
if (env.constainsOldVar(expr)) {
- return env.findSubstituion(expr);
+ return env.findSubstitution(expr);
} else {
// it is a variable from the context
VarIdentifier var = context.getRewrittenVar(expr.getVar().getId());
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/83197109/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineColumnAliasVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineColumnAliasVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineColumnAliasVisitor.java
index f5f2fe5..ea78c9b 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineColumnAliasVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineColumnAliasVisitor.java
@@ -139,7 +139,7 @@ public class InlineColumnAliasVisitor extends AbstractSqlppQueryExpressionVisito
VariableExpr columnAlias = new VariableExpr(
SqlppVariableUtil.toInternalVariableIdentifier(projection.getName()));
VariableSubstitutionEnvironment env = scopeChecker.getCurrentScope().getVarSubstitutionEnvironment();
- Expression gbyKey = (Expression) SqlppRewriteUtil.deepCopy(env.findSubstituion(columnAlias));
+ Expression gbyKey = (Expression) SqlppRewriteUtil.deepCopy(env.findSubstitution(columnAlias));
if (overwriteWithGbyKeyVarRefs) {
if (gbyKey != null) {
projection.setExpression(gbyKey);
@@ -233,7 +233,7 @@ public class InlineColumnAliasVisitor extends AbstractSqlppQueryExpressionVisito
if (overwriteWithGbyKeyVarRefs) {
// Rewrites the field value expression by the mapped grouping key
// (for the column alias) if there exists such a mapping.
- Expression gbyKey = (Expression) SqlppRewriteUtil.deepCopy(env.findSubstituion(columnAlias));
+ Expression gbyKey = (Expression) SqlppRewriteUtil.deepCopy(env.findSubstitution(columnAlias));
if (gbyKey != null) {
binding.setRightExpr(gbyKey);
}
@@ -335,7 +335,7 @@ public class InlineColumnAliasVisitor extends AbstractSqlppQueryExpressionVisito
}
if (oldGbyExpr.getKind() == Kind.VARIABLE_EXPRESSION) {
VariableExpr oldGbyVarExpr = (VariableExpr) oldGbyExpr;
- if (env.findSubstituion(oldGbyVarExpr) != null) {
+ if (env.findSubstitution(oldGbyVarExpr) != null) {
// Re-mapping that needs to be added.
oldGbyExprsToNewGbyVarMap.put(oldGbyVarExpr, gbyVarExpr.getVar());
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/83197109/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java
index f737eb7..923f86d 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java
@@ -35,7 +35,7 @@ public class SqlppSubstituteVariablesVisitor extends SqlppCloneAndSubstituteVari
protected Expression rewriteVariableExpr(VariableExpr expr, VariableSubstitutionEnvironment env)
throws AsterixException {
if (env.constainsOldVar(expr)) {
- return (Expression) SqlppRewriteUtil.deepCopy(env.findSubstituion(expr));
+ return (Expression) SqlppRewriteUtil.deepCopy(env.findSubstitution(expr));
}
return expr;
}