Till Westmann has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/786
Change subject: fix typo
......................................................................
fix typo
Change-Id: Iabd78359ae7cdb924a87444dd03968e6f428ab8e
---
M
asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java
M
asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java
M
asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/InlineColumnAliasVisitor.java
M
asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java
4 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/86/786/1
diff --git
a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java
b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java
index b99b3b3..4c4767e 100644
---
a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java
+++
b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/rewrites/VariableSubstitutionEnvironment.java
@@ -46,7 +46,7 @@
oldVarToNewExpressionMap.putAll(varExprMap);
}
- public Expression findSubstituion(VariableExpr oldVar) {
+ public Expression findSubstitution(VariableExpr oldVar) {
return oldVarToNewExpressionMap.get(oldVar.getVar().getValue());
}
diff --git
a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java
b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java
index ebe266e..32cd8e8 100644
---
a/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java
+++
b/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/CloneAndSubstituteVariablesVisitor.java
@@ -156,7 +156,7 @@
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 @@
// Replace a variable expression if the variable is to-be substituted.
protected Expression rewriteVariableExpr(VariableExpr expr,
VariableSubstitutionEnvironment env) {
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());
diff --git
a/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/InlineColumnAliasVisitor.java
b/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/InlineColumnAliasVisitor.java
index 98c74b4..b0453ab 100644
---
a/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/InlineColumnAliasVisitor.java
+++
b/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/InlineColumnAliasVisitor.java
@@ -137,7 +137,7 @@
projection.getExpression().accept(this, arg);
VariableExpr columnAlias = new
VariableExpr(SqlppVariableUtil.toInternalVariableIdentifier(projection.getName()));
VariableSubstitutionEnvironment env =
scopeChecker.getCurrentScope().getVarSubstitutionEnvironment();
- Expression gbyKey = env.findSubstituion(columnAlias);
+ Expression gbyKey = env.findSubstitution(columnAlias);
if (arg) {
scopeChecker.getCurrentScope().addSymbolExpressionMappingToScope(columnAlias,
projection.getExpression());
} else {
@@ -288,7 +288,7 @@
}
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());
}
@@ -368,7 +368,7 @@
scopeChecker.getCurrentScope().addSymbolExpressionMappingToScope(columnAlias,
binding.getRightExpr());
} else {
- Expression gbyKey = env.findSubstituion(columnAlias);
+ Expression gbyKey = env.findSubstitution(columnAlias);
if (gbyKey != null) {
binding.setRightExpr(gbyKey);
}
diff --git
a/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java
b/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java
index a9aff55..ab6afef 100644
---
a/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java
+++
b/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppSubstituteVariablesVisitor.java
@@ -32,7 +32,7 @@
@Override
protected Expression rewriteVariableExpr(VariableExpr expr,
VariableSubstitutionEnvironment env) {
if (env.constainsOldVar(expr)) {
- return env.findSubstituion(expr);
+ return env.findSubstitution(expr);
}
return expr;
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/786
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabd78359ae7cdb924a87444dd03968e6f428ab8e
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <[email protected]>
