You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by sj...@apache.org on 2017/01/16 18:46:47 UTC
[3/7] asterixdb git commit: Change the compilation related Exception
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/FromTerm.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/FromTerm.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/FromTerm.java
index d4e522a..e4390d9 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/FromTerm.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/FromTerm.java
@@ -22,7 +22,7 @@ package org.apache.asterix.lang.sqlpp.clause;
import java.util.ArrayList;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.expression.VariableExpr;
@@ -47,7 +47,7 @@ public class FromTerm implements Clause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/HavingClause.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/HavingClause.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/HavingClause.java
index 19b7692..aadbe42 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/HavingClause.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/HavingClause.java
@@ -18,7 +18,7 @@
*/
package org.apache.asterix.lang.sqlpp.clause;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
@@ -33,7 +33,7 @@ public class HavingClause implements Clause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/JoinClause.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/JoinClause.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/JoinClause.java
index 0da25cd..0b2a346 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/JoinClause.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/JoinClause.java
@@ -19,7 +19,7 @@
package org.apache.asterix.lang.sqlpp.clause;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.expression.VariableExpr;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
@@ -34,7 +34,7 @@ public class JoinClause extends AbstractBinaryCorrelateWithConditionClause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/NestClause.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/NestClause.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/NestClause.java
index 297868f..a2c27f0 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/NestClause.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/NestClause.java
@@ -19,7 +19,7 @@
package org.apache.asterix.lang.sqlpp.clause;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.expression.VariableExpr;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
@@ -34,7 +34,7 @@ public class NestClause extends AbstractBinaryCorrelateWithConditionClause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/Projection.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/Projection.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/Projection.java
index 148cc36..28d447a 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/Projection.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/Projection.java
@@ -19,7 +19,7 @@
package org.apache.asterix.lang.sqlpp.clause;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
@@ -41,7 +41,7 @@ public class Projection implements Clause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectBlock.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectBlock.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectBlock.java
index e297335..51e4ab4 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectBlock.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectBlock.java
@@ -22,7 +22,7 @@ package org.apache.asterix.lang.sqlpp.clause;
import java.util.ArrayList;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.clause.GroupbyClause;
import org.apache.asterix.lang.common.clause.LetClause;
@@ -58,7 +58,7 @@ public class SelectBlock implements Clause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectClause.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectClause.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectClause.java
index 12e501b..0a272f9 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectClause.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectClause.java
@@ -19,7 +19,7 @@
package org.apache.asterix.lang.sqlpp.clause;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.asterix.lang.sqlpp.visitor.base.ISqlppVisitor;
@@ -38,7 +38,7 @@ public class SelectClause implements Clause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectElement.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectElement.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectElement.java
index 6a630b5..9c82d5c 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectElement.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectElement.java
@@ -19,7 +19,7 @@
package org.apache.asterix.lang.sqlpp.clause;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
@@ -34,7 +34,7 @@ public class SelectElement implements Clause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectRegular.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectRegular.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectRegular.java
index 1df1e7a..a114337 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectRegular.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectRegular.java
@@ -22,7 +22,7 @@ package org.apache.asterix.lang.sqlpp.clause;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.asterix.lang.sqlpp.visitor.base.ISqlppVisitor;
@@ -36,7 +36,7 @@ public class SelectRegular implements Clause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectSetOperation.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectSetOperation.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectSetOperation.java
index 6e0fb21..ee622ea 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectSetOperation.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/SelectSetOperation.java
@@ -22,7 +22,7 @@ package org.apache.asterix.lang.sqlpp.clause;
import java.util.ArrayList;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.asterix.lang.sqlpp.struct.SetOperationInput;
@@ -43,7 +43,7 @@ public class SelectSetOperation implements Clause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/UnnestClause.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/UnnestClause.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/UnnestClause.java
index b71838b..f1a3964 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/UnnestClause.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/clause/UnnestClause.java
@@ -19,7 +19,7 @@
package org.apache.asterix.lang.sqlpp.clause;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.expression.VariableExpr;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
@@ -33,7 +33,7 @@ public class UnnestClause extends AbstractBinaryCorrelateClause {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/CaseExpression.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/CaseExpression.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/CaseExpression.java
index 45ff082..05300d1 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/CaseExpression.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/CaseExpression.java
@@ -22,7 +22,7 @@ package org.apache.asterix.lang.sqlpp.expression;
import java.util.ArrayList;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.expression.LiteralExpr;
import org.apache.asterix.lang.common.literal.NullLiteral;
@@ -48,7 +48,7 @@ public class CaseExpression implements Expression {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/IndependentSubquery.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/IndependentSubquery.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/IndependentSubquery.java
index 3b4c1aa..24a6217 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/IndependentSubquery.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/IndependentSubquery.java
@@ -19,7 +19,7 @@
package org.apache.asterix.lang.sqlpp.expression;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.asterix.lang.sqlpp.visitor.base.ISqlppVisitor;
@@ -33,7 +33,7 @@ public class IndependentSubquery implements Expression {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/SelectExpression.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/SelectExpression.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/SelectExpression.java
index a940c47..0fb687a 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/SelectExpression.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/SelectExpression.java
@@ -21,7 +21,7 @@ package org.apache.asterix.lang.sqlpp.expression;
import java.util.ArrayList;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.clause.LetClause;
import org.apache.asterix.lang.common.clause.LimitClause;
@@ -51,7 +51,7 @@ public class SelectExpression implements Expression {
}
@Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/FunctionParser.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/FunctionParser.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/FunctionParser.java
index a1ce60d..d59c5df 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/FunctionParser.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/FunctionParser.java
@@ -22,7 +22,7 @@ package org.apache.asterix.lang.sqlpp.parser;
import java.io.StringReader;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.IParser;
import org.apache.asterix.lang.common.base.IParserFactory;
import org.apache.asterix.lang.common.base.Statement;
@@ -39,7 +39,7 @@ public class FunctionParser {
this.parserFactory = parserFactory;
}
- public FunctionDecl getFunctionDecl(Function function) throws AsterixException {
+ public FunctionDecl getFunctionDecl(Function function) throws CompilationException {
String functionBody = function.getFunctionBody();
List<String> params = function.getParams();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java
index 5fee28f..fbf64f7 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java
@@ -20,7 +20,7 @@ package org.apache.asterix.lang.sqlpp.rewrites;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.IReturningStatement;
import org.apache.asterix.lang.common.rewrites.LangRewritingContext;
import org.apache.asterix.lang.common.statement.FunctionDecl;
@@ -31,7 +31,7 @@ class SqlppFunctionBodyRewriter extends SqlppQueryRewriter {
@Override
public void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topStatement,
MetadataProvider metadataProvider,
- LangRewritingContext context) throws AsterixException {
+ LangRewritingContext context) throws CompilationException {
// Sets up parameters.
setup(declaredFunctions, topStatement, metadataProvider, context);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
index 1662f85..f303a6c 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.IQueryRewriter;
@@ -86,7 +86,7 @@ class SqlppQueryRewriter implements IQueryRewriter {
@Override
public void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topStatement,
- MetadataProvider metadataProvider, LangRewritingContext context) throws AsterixException {
+ MetadataProvider metadataProvider, LangRewritingContext context) throws CompilationException {
if (topStatement == null) {
return;
}
@@ -147,22 +147,22 @@ class SqlppQueryRewriter implements IQueryRewriter {
topStatement.setVarCounter(context.getVarCounter());
}
- protected void rewriteGlobalAggregations() throws AsterixException {
+ protected void rewriteGlobalAggregations() throws CompilationException {
SqlppGlobalAggregationSugarVisitor globalAggregationVisitor = new SqlppGlobalAggregationSugarVisitor();
topExpr.accept(globalAggregationVisitor, null);
}
- protected void rewriteListInputFunctions() throws AsterixException {
+ protected void rewriteListInputFunctions() throws CompilationException {
SqlppListInputFunctionRewriteVisitor listInputFunctionVisitor = new SqlppListInputFunctionRewriteVisitor();
topExpr.accept(listInputFunctionVisitor, null);
}
- protected void rewriteFunctionNames() throws AsterixException {
+ protected void rewriteFunctionNames() throws CompilationException {
SqlppBuiltinFunctionRewriteVisitor functionNameMapVisitor = new SqlppBuiltinFunctionRewriteVisitor();
topExpr.accept(functionNameMapVisitor, null);
}
- protected void inlineWithExpressions() throws AsterixException {
+ protected void inlineWithExpressions() throws CompilationException {
String inlineWith = metadataProvider.getConfig().get(INLINE_WITH);
if (inlineWith != null && inlineWith.equalsIgnoreCase(NOT_INLINE_WITH)) {
return;
@@ -172,49 +172,49 @@ class SqlppQueryRewriter implements IQueryRewriter {
topExpr.accept(inlineWithExpressionVisitor, null);
}
- protected void generateColumnNames() throws AsterixException {
+ protected void generateColumnNames() throws CompilationException {
// Generate column names if they are missing in the user query.
GenerateColumnNameVisitor generateColumnNameVisitor = new GenerateColumnNameVisitor(context);
topExpr.accept(generateColumnNameVisitor, null);
}
- protected void substituteGroupbyKeyExpression() throws AsterixException {
+ protected void substituteGroupbyKeyExpression() throws CompilationException {
// Substitute group-by key expressions that appear in the select clause.
SubstituteGroupbyExpressionWithVariableVisitor substituteGbyExprVisitor =
new SubstituteGroupbyExpressionWithVariableVisitor(context);
topExpr.accept(substituteGbyExprVisitor, null);
}
- protected void rewriteSetOperations() throws AsterixException {
+ protected void rewriteSetOperations() throws CompilationException {
// Rewrites set operation queries that contain order-by and limit clauses.
SetOperationVisitor setOperationVisitor = new SetOperationVisitor(context);
topExpr.accept(setOperationVisitor, null);
}
- protected void rewriteOperatorExpression() throws AsterixException {
+ protected void rewriteOperatorExpression() throws CompilationException {
// Rewrites like/not-like/in/not-in operators into function call expressions.
OperatorExpressionVisitor operatorExpressionVisitor = new OperatorExpressionVisitor(context);
topExpr.accept(operatorExpressionVisitor, null);
}
- protected void inlineColumnAlias() throws AsterixException {
+ protected void inlineColumnAlias() throws CompilationException {
// Inline column aliases.
InlineColumnAliasVisitor inlineColumnAliasVisitor = new InlineColumnAliasVisitor(context);
topExpr.accept(inlineColumnAliasVisitor, null);
}
- protected void variableCheckAndRewrite(boolean overwrite) throws AsterixException {
+ protected void variableCheckAndRewrite(boolean overwrite) throws CompilationException {
VariableCheckAndRewriteVisitor variableCheckAndRewriteVisitor =
new VariableCheckAndRewriteVisitor(context, overwrite, metadataProvider);
topExpr.accept(variableCheckAndRewriteVisitor, null);
}
- protected void rewriteGroupBys() throws AsterixException {
+ protected void rewriteGroupBys() throws CompilationException {
SqlppGroupByVisitor groupByVisitor = new SqlppGroupByVisitor(context);
topExpr.accept(groupByVisitor, null);
}
- protected void inlineDeclaredUdfs() throws AsterixException {
+ protected void inlineDeclaredUdfs() throws CompilationException {
List<FunctionSignature> funIds = new ArrayList<FunctionSignature>();
for (FunctionDecl fdecl : declaredFunctions) {
funIds.add(fdecl.getSignature());
@@ -238,7 +238,7 @@ class SqlppQueryRewriter implements IQueryRewriter {
declaredFunctions.removeAll(usedStoredFunctionDecls);
}
- private Set<FunctionSignature> getFunctionCalls(Expression expression) throws AsterixException {
+ private Set<FunctionSignature> getFunctionCalls(Expression expression) throws CompilationException {
GatherFunctionCalls gfc = new GatherFunctionCalls();
expression.accept(gfc, null);
return gfc.getCalls();
@@ -250,7 +250,7 @@ class SqlppQueryRewriter implements IQueryRewriter {
}
@Override
- public Void visit(FromClause fromClause, Void arg) throws AsterixException {
+ public Void visit(FromClause fromClause, Void arg) throws CompilationException {
for (FromTerm fromTerm : fromClause.getFromTerms()) {
fromTerm.accept(this, arg);
}
@@ -258,7 +258,7 @@ class SqlppQueryRewriter implements IQueryRewriter {
}
@Override
- public Void visit(FromTerm fromTerm, Void arg) throws AsterixException {
+ public Void visit(FromTerm fromTerm, Void arg) throws CompilationException {
fromTerm.getLeftExpression().accept(this, arg);
for (AbstractBinaryCorrelateClause correlateClause : fromTerm.getCorrelateClauses()) {
correlateClause.accept(this, arg);
@@ -267,21 +267,21 @@ class SqlppQueryRewriter implements IQueryRewriter {
}
@Override
- public Void visit(JoinClause joinClause, Void arg) throws AsterixException {
+ public Void visit(JoinClause joinClause, Void arg) throws CompilationException {
joinClause.getRightExpression().accept(this, arg);
joinClause.getConditionExpression().accept(this, arg);
return null;
}
@Override
- public Void visit(NestClause nestClause, Void arg) throws AsterixException {
+ public Void visit(NestClause nestClause, Void arg) throws CompilationException {
nestClause.getRightExpression().accept(this, arg);
nestClause.getConditionExpression().accept(this, arg);
return null;
}
@Override
- public Void visit(Projection projection, Void arg) throws AsterixException {
+ public Void visit(Projection projection, Void arg) throws CompilationException {
if (!projection.star()) {
projection.getExpression().accept(this, arg);
}
@@ -289,7 +289,7 @@ class SqlppQueryRewriter implements IQueryRewriter {
}
@Override
- public Void visit(SelectBlock selectBlock, Void arg) throws AsterixException {
+ public Void visit(SelectBlock selectBlock, Void arg) throws CompilationException {
if (selectBlock.hasFromClause()) {
selectBlock.getFromClause().accept(this, arg);
}
@@ -317,7 +317,7 @@ class SqlppQueryRewriter implements IQueryRewriter {
}
@Override
- public Void visit(SelectClause selectClause, Void arg) throws AsterixException {
+ public Void visit(SelectClause selectClause, Void arg) throws CompilationException {
if (selectClause.selectElement()) {
selectClause.getSelectElement().accept(this, arg);
} else {
@@ -327,13 +327,13 @@ class SqlppQueryRewriter implements IQueryRewriter {
}
@Override
- public Void visit(SelectElement selectElement, Void arg) throws AsterixException {
+ public Void visit(SelectElement selectElement, Void arg) throws CompilationException {
selectElement.getExpression().accept(this, arg);
return null;
}
@Override
- public Void visit(SelectRegular selectRegular, Void arg) throws AsterixException {
+ public Void visit(SelectRegular selectRegular, Void arg) throws CompilationException {
for (Projection projection : selectRegular.getProjections()) {
projection.accept(this, arg);
}
@@ -341,7 +341,7 @@ class SqlppQueryRewriter implements IQueryRewriter {
}
@Override
- public Void visit(SelectSetOperation selectSetOperation, Void arg) throws AsterixException {
+ public Void visit(SelectSetOperation selectSetOperation, Void arg) throws CompilationException {
selectSetOperation.getLeftInput().accept(this, arg);
for (SetOperationRight setOperationRight : selectSetOperation.getRightInputs()) {
setOperationRight.getSetOperationRightInput().accept(this, arg);
@@ -350,7 +350,7 @@ class SqlppQueryRewriter implements IQueryRewriter {
}
@Override
- public Void visit(SelectExpression selectStatement, Void arg) throws AsterixException {
+ public Void visit(SelectExpression selectStatement, Void arg) throws CompilationException {
selectStatement.getSelectSetOperation().accept(this, arg);
if (selectStatement.hasOrderby()) {
selectStatement.getOrderbyClause().accept(this, arg);
@@ -362,25 +362,25 @@ class SqlppQueryRewriter implements IQueryRewriter {
}
@Override
- public Void visit(UnnestClause unnestClause, Void arg) throws AsterixException {
+ public Void visit(UnnestClause unnestClause, Void arg) throws CompilationException {
unnestClause.getRightExpression().accept(this, arg);
return null;
}
@Override
- public Void visit(HavingClause havingClause, Void arg) throws AsterixException {
+ public Void visit(HavingClause havingClause, Void arg) throws CompilationException {
havingClause.getFilterExpression().accept(this, arg);
return null;
}
@Override
- public Void visit(IndependentSubquery independentSubquery, Void arg) throws AsterixException {
+ public Void visit(IndependentSubquery independentSubquery, Void arg) throws CompilationException {
independentSubquery.getExpr().accept(this, arg);
return null;
}
@Override
- public Void visit(CaseExpression caseExpression, Void arg) throws AsterixException {
+ public Void visit(CaseExpression caseExpression, Void arg) throws CompilationException {
caseExpression.getConditionExpr().accept(this, arg);
for (Expression expr : caseExpression.getWhenExprs()) {
expr.accept(this, arg);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppStatementRewriter.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppStatementRewriter.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppStatementRewriter.java
index 01cb0f1..5667415 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppStatementRewriter.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppStatementRewriter.java
@@ -18,7 +18,7 @@
*/
package org.apache.asterix.lang.sqlpp.rewrites;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.IStatementRewriter;
import org.apache.asterix.lang.common.base.Statement;
import org.apache.asterix.lang.sqlpp.visitor.SqlppDeleteRewriteVisitor;
@@ -26,11 +26,11 @@ import org.apache.asterix.lang.sqlpp.visitor.SqlppDeleteRewriteVisitor;
class SqlppStatementRewriter implements IStatementRewriter {
@Override
- public void rewrite(Statement stmt) throws AsterixException {
+ public void rewrite(Statement stmt) throws CompilationException {
rewriteDeleteStatement(stmt);
}
- private void rewriteDeleteStatement(Statement stmt) throws AsterixException {
+ private void rewriteDeleteStatement(Statement stmt) throws CompilationException {
if (stmt != null) {
SqlppDeleteRewriteVisitor visitor = new SqlppDeleteRewriteVisitor();
stmt.accept(visitor, null);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/GenerateColumnNameVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/GenerateColumnNameVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/GenerateColumnNameVisitor.java
index e2edb3a..4e1ab1f 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/GenerateColumnNameVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/GenerateColumnNameVisitor.java
@@ -19,7 +19,7 @@
package org.apache.asterix.lang.sqlpp.rewrites.visitor;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.clause.GroupbyClause;
@@ -39,14 +39,14 @@ public class GenerateColumnNameVisitor extends AbstractSqlppExpressionScopingVis
}
@Override
- public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws AsterixException {
+ public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws CompilationException {
// Visit selectBlock first so that column names starts from $1.
selectBlock.getSelectClause().accept(this, arg);
return super.visit(selectBlock, arg);
}
@Override
- public Expression visit(Projection projection, ILangExpression arg) throws AsterixException {
+ public Expression visit(Projection projection, ILangExpression arg) throws CompilationException {
if (!projection.star() && projection.getName() == null) {
projection.setName(SqlppVariableUtil.variableNameToDisplayedFieldName(context.newVariable().getValue()));
}
@@ -54,7 +54,7 @@ public class GenerateColumnNameVisitor extends AbstractSqlppExpressionScopingVis
}
@Override
- public Expression visit(GroupbyClause groupbyClause, ILangExpression arg) throws AsterixException {
+ public Expression visit(GroupbyClause groupbyClause, ILangExpression arg) throws CompilationException {
for (GbyVariableExpressionPair gbyKeyPair : groupbyClause.getGbyPairList()) {
if (gbyKeyPair.getVar() == null) {
gbyKeyPair.setVar(new VariableExpr(context.newVariable()));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/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 36786cd..628bf57 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
@@ -23,11 +23,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
+import org.apache.asterix.lang.common.base.Expression.Kind;
import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.base.Literal;
-import org.apache.asterix.lang.common.base.Expression.Kind;
import org.apache.asterix.lang.common.clause.LetClause;
import org.apache.asterix.lang.common.expression.FieldBinding;
import org.apache.asterix.lang.common.expression.LiteralExpr;
@@ -52,7 +52,7 @@ public class InlineColumnAliasVisitor extends AbstractSqlppExpressionScopingVisi
}
@Override
- public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws AsterixException {
+ public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws CompilationException {
// Gets the map from select clause.
Map<Expression, Expression> map = getMap(selectBlock.getSelectClause());
@@ -93,7 +93,7 @@ public class InlineColumnAliasVisitor extends AbstractSqlppExpressionScopingVisi
return super.visit(selectBlock, arg);
}
- private Map<Expression, Expression> getMap(SelectClause selectClause) throws AsterixException {
+ private Map<Expression, Expression> getMap(SelectClause selectClause) throws CompilationException {
if (selectClause.selectElement()) {
return getMap(selectClause.getSelectElement());
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java
index 7a4f0fe..54ef5ab 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.clause.LetClause;
@@ -41,7 +41,7 @@ public class InlineWithExpressionVisitor extends AbstractSqlppExpressionScopingV
}
@Override
- public Expression visit(SelectExpression selectExpression, ILangExpression arg) throws AsterixException {
+ public Expression visit(SelectExpression selectExpression, ILangExpression arg) throws CompilationException {
if (selectExpression.hasLetClauses()) {
// Inlines the leading WITH list.
Map<Expression, Expression> varExprMap = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
index 60c4aa0..aa337e3 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
@@ -23,15 +23,15 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.expression.CallExpr;
import org.apache.asterix.lang.common.expression.OperatorExpr;
import org.apache.asterix.lang.common.expression.QuantifiedExpression;
-import org.apache.asterix.lang.common.expression.VariableExpr;
import org.apache.asterix.lang.common.expression.QuantifiedExpression.Quantifier;
+import org.apache.asterix.lang.common.expression.VariableExpr;
import org.apache.asterix.lang.common.rewrites.LangRewritingContext;
import org.apache.asterix.lang.common.struct.OperatorType;
import org.apache.asterix.lang.common.struct.QuantifiedPair;
@@ -47,7 +47,7 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis
}
@Override
- public Expression visit(OperatorExpr operatorExpr, ILangExpression arg) throws AsterixException {
+ public Expression visit(OperatorExpr operatorExpr, ILangExpression arg) throws CompilationException {
List<Expression> newExprList = new ArrayList<>();
for (Expression expr : operatorExpr.getExprList()) {
newExprList.add(expr.accept(this, operatorExpr));
@@ -83,7 +83,7 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis
new ArrayList<>(Collections.singletonList(likeExpr)));
}
- private Expression processInOperator(OperatorExpr operatorExpr, OperatorType opType) throws AsterixException {
+ private Expression processInOperator(OperatorExpr operatorExpr, OperatorType opType) throws CompilationException {
VariableExpr bindingVar = new VariableExpr(context.newVariable());
Expression itemExpr = operatorExpr.getExprList().get(0);
Expression collectionExpr = operatorExpr.getExprList().get(1);
@@ -107,7 +107,8 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis
return new CallExpr(new FunctionSignature(null, CONCAT, 1), operatorExpr.getExprList());
}
- private Expression processBetweenOperator(OperatorExpr operatorExpr, OperatorType opType) throws AsterixException {
+ private Expression processBetweenOperator(OperatorExpr operatorExpr, OperatorType opType)
+ throws CompilationException {
// The grammar guarantees that the BETWEEN operator gets exactly three expressions.
Expression target = operatorExpr.getExprList().get(0);
Expression left = operatorExpr.getExprList().get(1);
@@ -127,7 +128,7 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis
}
private Expression createLessThanExpression(Expression lhs, Expression rhs, List<IExpressionAnnotation> hints)
- throws AsterixException {
+ throws CompilationException {
OperatorExpr comparison = new OperatorExpr();
comparison.addOperand(lhs);
comparison.addOperand(rhs);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SetOperationVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SetOperationVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SetOperationVisitor.java
index 66bfecd..ddf3cd6 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SetOperationVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SetOperationVisitor.java
@@ -22,7 +22,7 @@ package org.apache.asterix.lang.sqlpp.rewrites.visitor;
import java.util.ArrayList;
import java.util.Collections;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.clause.LimitClause;
@@ -72,7 +72,7 @@ public class SetOperationVisitor extends AbstractSqlppExpressionScopingVisitor {
}
@Override
- public Expression visit(SelectExpression selectExpression, ILangExpression arg) throws AsterixException {
+ public Expression visit(SelectExpression selectExpression, ILangExpression arg) throws CompilationException {
// Recursively visit nested select expressions.
SelectSetOperation selectSetOperation = selectExpression.getSelectSetOperation();
if (!selectSetOperation.hasRightInputs() || !(selectExpression.hasOrderby() || selectExpression.hasLimit())) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
index fbf08ee..f168ebd 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
@@ -21,7 +21,7 @@ package org.apache.asterix.lang.sqlpp.rewrites.visitor;
import java.util.ArrayList;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
@@ -39,7 +39,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
public class SqlppBuiltinFunctionRewriteVisitor extends AbstractSqlppSimpleExpressionVisitor {
@Override
- public Expression visit(CallExpr callExpr, ILangExpression arg) throws AsterixException {
+ public Expression visit(CallExpr callExpr, ILangExpression arg) throws CompilationException {
//TODO(buyingyi): rewrite SQL temporal functions
FunctionSignature functionSignature = callExpr.getFunctionSignature();
callExpr.setFunctionSignature(FunctionMapUtil.normalizeBuiltinFunctionSignature(functionSignature, true));
@@ -52,7 +52,7 @@ public class SqlppBuiltinFunctionRewriteVisitor extends AbstractSqlppSimpleExpre
}
@Override
- public Expression visit(CaseExpression caseExpr, ILangExpression arg) throws AsterixException {
+ public Expression visit(CaseExpression caseExpr, ILangExpression arg) throws CompilationException {
Expression expr = super.visit(caseExpr, arg); // Visits it as usual first.
if (expr != caseExpr) {
return expr.accept(this, arg);
@@ -79,7 +79,7 @@ public class SqlppBuiltinFunctionRewriteVisitor extends AbstractSqlppSimpleExpre
// Normalizes WHEN expressions so that it can have correct NULL/MISSING semantics as well
// as type promotion semantics.
- private CaseExpression normalizeCaseExpr(CaseExpression caseExpr) throws AsterixException {
+ private CaseExpression normalizeCaseExpr(CaseExpression caseExpr) throws CompilationException {
LiteralExpr trueLiteral = new LiteralExpr(TrueLiteral.INSTANCE);
Expression conditionExpr = caseExpr.getConditionExpr();
if (trueLiteral.equals(conditionExpr)) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGlobalAggregationSugarVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGlobalAggregationSugarVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGlobalAggregationSugarVisitor.java
index 9430e4f..16ae05c 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGlobalAggregationSugarVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGlobalAggregationSugarVisitor.java
@@ -22,13 +22,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.clause.GroupbyClause;
import org.apache.asterix.lang.common.expression.GbyVariableExpressionPair;
-import org.apache.asterix.lang.common.expression.LiteralExpr;
-import org.apache.asterix.lang.common.literal.IntegerLiteral;
import org.apache.asterix.lang.sqlpp.clause.SelectBlock;
import org.apache.asterix.lang.sqlpp.clause.SelectClause;
import org.apache.asterix.lang.sqlpp.visitor.CheckSql92AggregateVisitor;
@@ -37,7 +35,7 @@ import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppSimpleExpressionV
public class SqlppGlobalAggregationSugarVisitor extends AbstractSqlppSimpleExpressionVisitor {
@Override
- public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws AsterixException {
+ public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws CompilationException {
SelectClause selectClause = selectBlock.getSelectClause();
if (!selectBlock.hasGroupbyClause() && selectBlock.hasFromClause()) {
boolean addImplicitGby;
@@ -58,7 +56,7 @@ public class SqlppGlobalAggregationSugarVisitor extends AbstractSqlppSimpleExpre
return super.visit(selectBlock, arg);
}
- private boolean isSql92Aggregate(ILangExpression expr, SelectBlock selectBlock) throws AsterixException {
+ private boolean isSql92Aggregate(ILangExpression expr, SelectBlock selectBlock) throws CompilationException {
CheckSql92AggregateVisitor visitor = new CheckSql92AggregateVisitor();
return expr.accept(visitor, selectBlock);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupBySugarVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupBySugarVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupBySugarVisitor.java
index 996a2ec..a1c17fc 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupBySugarVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupBySugarVisitor.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
@@ -90,7 +90,7 @@ public class SqlppGroupBySugarVisitor extends AbstractSqlppExpressionScopingVisi
}
@Override
- public Expression visit(CallExpr callExpr, ILangExpression arg) throws AsterixException {
+ public Expression visit(CallExpr callExpr, ILangExpression arg) throws CompilationException {
List<Expression> newExprList = new ArrayList<>();
FunctionSignature signature = callExpr.getFunctionSignature();
boolean aggregate = FunctionMapUtil.isSql92AggregateFunction(signature);
@@ -109,7 +109,7 @@ public class SqlppGroupBySugarVisitor extends AbstractSqlppExpressionScopingVisi
return callExpr;
}
- private Expression wrapAggregationArgument(Expression argExpr) throws AsterixException {
+ private Expression wrapAggregationArgument(Expression argExpr) throws CompilationException {
Expression expr = argExpr;
Set<VariableExpr> freeVars = SqlppRewriteUtil.getFreeVariable(expr);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByVisitor.java
index 0170709..b928285 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByVisitor.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.clause.GroupbyClause;
@@ -91,7 +91,7 @@ public class SqlppGroupByVisitor extends AbstractSqlppExpressionScopingVisitor {
}
@Override
- public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws AsterixException {
+ public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws CompilationException {
// Traverses the select block in the order of "from", "let"s, "where",
// "group by", "let"s, "having" and "select".
FromClause fromClause = selectBlock.getFromClause();
@@ -219,7 +219,7 @@ public class SqlppGroupByVisitor extends AbstractSqlppExpressionScopingVisitor {
}
@Override
- public Expression visit(GroupbyClause gc, ILangExpression arg) throws AsterixException {
+ public Expression visit(GroupbyClause gc, ILangExpression arg) throws CompilationException {
// Puts all FROM binding variables into withVarList.
FromClause fromClause = (FromClause) arg;
Collection<VariableExpr> fromBindingVars =
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java
index 56cbb18..b2f56a5 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.IRewriterFactory;
import org.apache.asterix.lang.common.clause.LetClause;
@@ -73,13 +73,13 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
@Override
protected Expression generateQueryExpression(List<LetClause> letClauses, Expression returnExpr)
- throws AsterixException {
+ throws CompilationException {
Map<Expression, Expression> varExprMap = extractLetBindingVariableExpressionMappings(letClauses);
- return (Expression) SqlppRewriteUtil.substituteExpression(returnExpr, varExprMap, context);
+ return SqlppRewriteUtil.substituteExpression(returnExpr, varExprMap, context);
}
@Override
- public Boolean visit(FromClause fromClause, List<FunctionDecl> func) throws AsterixException {
+ public Boolean visit(FromClause fromClause, List<FunctionDecl> func) throws CompilationException {
boolean changed = false;
for (FromTerm fromTerm : fromClause.getFromTerms()) {
changed |= fromTerm.accept(this, func);
@@ -88,7 +88,7 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
@Override
- public Boolean visit(FromTerm fromTerm, List<FunctionDecl> func) throws AsterixException {
+ public Boolean visit(FromTerm fromTerm, List<FunctionDecl> func) throws CompilationException {
boolean changed = false;
Pair<Boolean, Expression> p = inlineUdfsInExpr(fromTerm.getLeftExpression(), func);
fromTerm.setLeftExpression(p.second);
@@ -100,7 +100,7 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
@Override
- public Boolean visit(JoinClause joinClause, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(JoinClause joinClause, List<FunctionDecl> funcs) throws CompilationException {
Pair<Boolean, Expression> p1 = inlineUdfsInExpr(joinClause.getRightExpression(), funcs);
joinClause.setRightExpression(p1.second);
Pair<Boolean, Expression> p2 = inlineUdfsInExpr(joinClause.getConditionExpression(), funcs);
@@ -109,7 +109,7 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
@Override
- public Boolean visit(NestClause nestClause, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(NestClause nestClause, List<FunctionDecl> funcs) throws CompilationException {
Pair<Boolean, Expression> p1 = inlineUdfsInExpr(nestClause.getRightExpression(), funcs);
nestClause.setRightExpression(p1.second);
Pair<Boolean, Expression> p2 = inlineUdfsInExpr(nestClause.getConditionExpression(), funcs);
@@ -118,14 +118,14 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
@Override
- public Boolean visit(Projection projection, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(Projection projection, List<FunctionDecl> funcs) throws CompilationException {
Pair<Boolean, Expression> p = inlineUdfsInExpr(projection.getExpression(), funcs);
projection.setExpression(p.second);
return p.first;
}
@Override
- public Boolean visit(SelectBlock selectBlock, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(SelectBlock selectBlock, List<FunctionDecl> funcs) throws CompilationException {
boolean changed = false;
if (selectBlock.hasFromClause()) {
changed |= selectBlock.getFromClause().accept(this, funcs);
@@ -154,7 +154,7 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
@Override
- public Boolean visit(SelectClause selectClause, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(SelectClause selectClause, List<FunctionDecl> funcs) throws CompilationException {
boolean changed = false;
if (selectClause.selectElement()) {
changed |= selectClause.getSelectElement().accept(this, funcs);
@@ -165,14 +165,14 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
@Override
- public Boolean visit(SelectElement selectElement, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(SelectElement selectElement, List<FunctionDecl> funcs) throws CompilationException {
Pair<Boolean, Expression> p = inlineUdfsInExpr(selectElement.getExpression(), funcs);
selectElement.setExpression(p.second);
return p.first;
}
@Override
- public Boolean visit(SelectRegular selectRegular, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(SelectRegular selectRegular, List<FunctionDecl> funcs) throws CompilationException {
boolean changed = false;
for (Projection projection : selectRegular.getProjections()) {
changed |= projection.accept(this, funcs);
@@ -181,7 +181,7 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
@Override
- public Boolean visit(SelectSetOperation selectSetOperation, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(SelectSetOperation selectSetOperation, List<FunctionDecl> funcs) throws CompilationException {
boolean changed = false;
changed |= selectSetOperation.getLeftInput().accept(this, funcs);
for (SetOperationRight right : selectSetOperation.getRightInputs()) {
@@ -191,7 +191,7 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
@Override
- public Boolean visit(SelectExpression selectExpression, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(SelectExpression selectExpression, List<FunctionDecl> funcs) throws CompilationException {
boolean changed = false;
if (selectExpression.hasLetClauses()) {
for (LetClause letClause : selectExpression.getLetList()) {
@@ -209,28 +209,29 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
@Override
- public Boolean visit(UnnestClause unnestClause, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(UnnestClause unnestClause, List<FunctionDecl> funcs) throws CompilationException {
Pair<Boolean, Expression> p = inlineUdfsInExpr(unnestClause.getRightExpression(), funcs);
unnestClause.setRightExpression(p.second);
return p.first;
}
@Override
- public Boolean visit(HavingClause havingClause, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(HavingClause havingClause, List<FunctionDecl> funcs) throws CompilationException {
Pair<Boolean, Expression> p = inlineUdfsInExpr(havingClause.getFilterExpression(), funcs);
havingClause.setFilterExpression(p.second);
return p.first;
}
@Override
- public Boolean visit(IndependentSubquery independentSubquery, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(IndependentSubquery independentSubquery, List<FunctionDecl> funcs)
+ throws CompilationException {
Pair<Boolean, Expression> p = inlineUdfsInExpr(independentSubquery.getExpr(), funcs);
independentSubquery.setExpr(p.second);
return p.first;
}
@Override
- public Boolean visit(CaseExpression caseExpr, List<FunctionDecl> funcs) throws AsterixException {
+ public Boolean visit(CaseExpression caseExpr, List<FunctionDecl> funcs) throws CompilationException {
Pair<Boolean, Expression> result = inlineUdfsInExpr(caseExpr.getConditionExpr(), funcs);
caseExpr.setConditionExpr(result.second);
boolean inlined = result.first;
@@ -249,11 +250,11 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor
}
private Map<Expression, Expression> extractLetBindingVariableExpressionMappings(List<LetClause> letClauses)
- throws AsterixException {
+ throws CompilationException {
Map<Expression, Expression> varExprMap = new HashMap<>();
for (LetClause lc : letClauses) {
// inline let variables one by one iteratively.
- lc.setBindingExpr((Expression) SqlppRewriteUtil.substituteExpression(lc.getBindingExpr(),
+ lc.setBindingExpr(SqlppRewriteUtil.substituteExpression(lc.getBindingExpr(),
varExprMap, context));
varExprMap.put(lc.getVarExpr(), lc.getBindingExpr());
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppListInputFunctionRewriteVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppListInputFunctionRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppListInputFunctionRewriteVisitor.java
index 847076b..2e65292 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppListInputFunctionRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppListInputFunctionRewriteVisitor.java
@@ -22,7 +22,7 @@ package org.apache.asterix.lang.sqlpp.rewrites.visitor;
import java.util.ArrayList;
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.expression.CallExpr;
@@ -36,7 +36,7 @@ import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppSimpleExpressionV
public class SqlppListInputFunctionRewriteVisitor extends AbstractSqlppSimpleExpressionVisitor {
@Override
- public Expression visit(CallExpr callExpr, ILangExpression arg) throws AsterixException {
+ public Expression visit(CallExpr callExpr, ILangExpression arg) throws CompilationException {
List<Expression> newExprList = new ArrayList<>();
for (Expression expr : callExpr.getExprList()) {
newExprList.add(expr.accept(this, arg));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java
index eb2f463..6d4816b 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java
@@ -22,11 +22,11 @@ package org.apache.asterix.lang.sqlpp.rewrites.visitor;
import java.util.HashMap;
import java.util.Map;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.base.Expression;
-import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.base.Expression.Kind;
+import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.clause.LetClause;
import org.apache.asterix.lang.common.expression.CallExpr;
import org.apache.asterix.lang.common.expression.GbyVariableExpressionPair;
@@ -46,7 +46,7 @@ public class SubstituteGroupbyExpressionWithVariableVisitor extends AbstractSqlp
}
@Override
- public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws AsterixException {
+ public Expression visit(SelectBlock selectBlock, ILangExpression arg) throws CompilationException {
if (selectBlock.hasGroupbyClause()) {
Map<Expression, Expression> map = new HashMap<>();
for (GbyVariableExpressionPair gbyKeyPair : selectBlock.getGroupbyClause().getGbyPairList()) {
@@ -93,7 +93,7 @@ class SubstituteGroupbyExpressionVisitor extends SqlppSubstituteExpressionVisito
}
@Override
- public Expression visit(CallExpr callExpr, ILangExpression arg) throws AsterixException {
+ public Expression visit(CallExpr callExpr, ILangExpression arg) throws CompilationException {
FunctionSignature signature = callExpr.getFunctionSignature();
if (FunctionMapUtil.isSql92AggregateFunction(signature)) {
return callExpr;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java
index 311a4ea..c271365 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java
@@ -22,11 +22,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.base.Expression;
-import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.base.Expression.Kind;
+import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.expression.CallExpr;
import org.apache.asterix.lang.common.expression.FieldAccessor;
import org.apache.asterix.lang.common.expression.LiteralExpr;
@@ -65,7 +65,7 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi
}
@Override
- public Expression visit(FieldAccessor fa, ILangExpression parent) throws AsterixException {
+ public Expression visit(FieldAccessor fa, ILangExpression parent) throws CompilationException {
Expression leadingExpr = fa.getExpr();
if (leadingExpr.getKind() != Kind.VARIABLE_EXPRESSION) {
fa.setExpr(leadingExpr.accept(this, fa));
@@ -90,7 +90,7 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi
}
@Override
- public Expression visit(VariableExpr varExpr, ILangExpression parent) throws AsterixException {
+ public Expression visit(VariableExpr varExpr, ILangExpression parent) throws CompilationException {
return resolve(varExpr, null /** Resolves within the default dataverse. */
, SqlppVariableUtil.toUserDefinedVariableName(varExpr.getVar().getValue()).getValue(), varExpr, parent);
}
@@ -98,7 +98,7 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi
// Resolve a variable expression with dataverse name and dataset name.
private Expression resolve(VariableExpr varExpr, String dataverseName, String datasetName,
Expression originalExprWithUndefinedIdentifier, ILangExpression parent)
- throws AsterixException {
+ throws CompilationException {
String varName = varExpr.getVar().getValue();
checkError(varName);
if (!rewriteNeeded(varExpr)) {
@@ -123,23 +123,23 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi
return wrapWithResolveFunction(varExpr, liveVars);
}
- private void throwUnresolvableError(String dataverseName, String datasetName) throws AsterixException {
+ private void throwUnresolvableError(String dataverseName, String datasetName) throws CompilationException {
String defaultDataverseName = metadataProvider.getDefaultDataverseName();
if (dataverseName == null && defaultDataverseName == null) {
- throw new AsterixException("Cannot find dataset " + datasetName
+ throw new CompilationException("Cannot find dataset " + datasetName
+ " because there is no dataverse declared, nor an alias with name " + datasetName + "!");
}
//If no available dataset nor in-scope variable to resolve to, we throw an error.
- throw new AsterixException("Cannot find dataset " + datasetName + " in dataverse "
+ throw new CompilationException("Cannot find dataset " + datasetName + " in dataverse "
+ (dataverseName == null ? defaultDataverseName : dataverseName) + " nor an alias with name "
+ datasetName + "!");
}
// Checks whether we need to error the variable reference, e.g., the variable is referred
// in a LIMIT clause.
- private void checkError(String varName) throws AsterixException {
+ private void checkError(String varName) throws CompilationException {
if (scopeChecker.isInForbiddenScopes(varName)) {
- throw new AsterixException(
+ throw new CompilationException(
"Inside limit clauses, it is disallowed to reference a variable having the same name"
+ " as any variable bound in the same scope as the limit clause.");
}
@@ -148,13 +148,13 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi
// For a From/Join/UNNEST/Quantifiers binding expression, we resolve the undefined identifier reference as
// a dataset access only.
private boolean resolveToDatasetOnly(Expression originalExpressionWithUndefinedIdentifier, ILangExpression parent)
- throws AsterixException {
+ throws CompilationException {
CheckDatasetOnlyResolutionVisitor visitor = new CheckDatasetOnlyResolutionVisitor();
return parent.accept(visitor, originalExpressionWithUndefinedIdentifier);
}
// Whether a rewrite is needed for a variable reference expression.
- private boolean rewriteNeeded(VariableExpr varExpr) throws AsterixException {
+ private boolean rewriteNeeded(VariableExpr varExpr) throws CompilationException {
String varName = varExpr.getVar().getValue();
Identifier ident = scopeChecker.lookupSymbol(varName);
if (ident != null) {
@@ -168,21 +168,21 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi
}
}
- private Expression wrapWithDatasetFunction(String dataverseName, String datasetName) throws AsterixException {
+ private Expression wrapWithDatasetFunction(String dataverseName, String datasetName) throws CompilationException {
String fullyQualifiedName = dataverseName == null ? datasetName : dataverseName + "." + datasetName;
List<Expression> argList = new ArrayList<>();
argList.add(new LiteralExpr(new StringLiteral(fullyQualifiedName)));
return new CallExpr(datasetFunction, argList);
}
- private boolean datasetExists(String dataverseName, String datasetName) throws AsterixException {
+ private boolean datasetExists(String dataverseName, String datasetName) throws CompilationException {
try {
if (metadataProvider.findDataset(dataverseName, datasetName) != null) {
return true;
}
return fullyQualifiedDatasetNameExists(datasetName);
} catch (AlgebricksException e) {
- throw new AsterixException(e);
+ throw new CompilationException(e);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/struct/SetOperationInput.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/struct/SetOperationInput.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/struct/SetOperationInput.java
index 55245fe..0c4b65b 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/struct/SetOperationInput.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/struct/SetOperationInput.java
@@ -18,7 +18,7 @@
*/
package org.apache.asterix.lang.sqlpp.struct;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.asterix.lang.sqlpp.clause.SelectBlock;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
@@ -51,7 +51,7 @@ public class SetOperationInput {
return subquery != null;
}
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws AsterixException {
+ public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
if (selectBlock != null) {
return ((ISqlppVisitor<R, T>) visitor).visit(selectBlock, arg);
} else {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/ExpressionToVariableUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/ExpressionToVariableUtil.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/ExpressionToVariableUtil.java
index 93e1828..cd805a1 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/ExpressionToVariableUtil.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/ExpressionToVariableUtil.java
@@ -19,7 +19,7 @@
package org.apache.asterix.lang.sqlpp.util;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.Expression.Kind;
import org.apache.asterix.lang.common.expression.FieldAccessor;
@@ -46,7 +46,7 @@ public class ExpressionToVariableUtil {
try {
throw new ParseException(
"Need an alias for the enclosed expression:\n" + SqlppFormatPrintUtil.toString(expr));
- } catch (AsterixException e) {
+ } catch (CompilationException e) {
LOGGER.error(e.getLocalizedMessage(), e);
throw new ParseException(e.getLocalizedMessage());
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e65e6ca4/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
index b7d3d62..8f04980 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.functions.FunctionConstants;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.expression.CallExpr;
@@ -58,7 +58,7 @@ public class FunctionMapUtil {
* @return true if the function signature is a SQL-92 core aggregate,
* false otherwise.
*/
- public static boolean isSql92AggregateFunction(FunctionSignature signature) throws AsterixException {
+ public static boolean isSql92AggregateFunction(FunctionSignature signature) throws CompilationException {
IFunctionInfo finfo = FunctionUtil.getFunctionInfo(new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
signature.getName().toLowerCase(), signature.getArity()));
if (finfo == null) {
@@ -98,9 +98,9 @@ public class FunctionMapUtil {
* @param fs,
* the SQL-92 aggregate function signature.
* @return the SQL++ aggregate function signature.
- * @throws AsterixException
+ * @throws CompilationException
*/
- public static FunctionSignature sql92ToCoreAggregateFunction(FunctionSignature fs) throws AsterixException {
+ public static FunctionSignature sql92ToCoreAggregateFunction(FunctionSignature fs) throws CompilationException {
if (!isSql92AggregateFunction(fs)) {
return fs;
}
@@ -116,11 +116,11 @@ public class FunctionMapUtil {
* @return the system internal function.
*/
public static FunctionSignature normalizeBuiltinFunctionSignature(FunctionSignature fs, boolean checkSql92Aggregate)
- throws AsterixException {
+ throws CompilationException {
if (isCoreAggregateFunction(fs)) {
return internalizeCoreAggregateFunctionName(fs);
} else if (checkSql92Aggregate && isSql92AggregateFunction(fs)) {
- throw new AsterixException(fs.getName()
+ throw new CompilationException(fs.getName()
+ " is a SQL-92 aggregate function. The SQL++ core aggregate function " + CORE_SQL_AGGREGATE_PREFIX
+ fs.getName().toLowerCase() + " could potentially express the intent.");
}
@@ -153,10 +153,10 @@ public class FunctionMapUtil {
* @param fs,
* a user-facing SQL++ core aggregate function signature.
* @return the AsterixDB internal function signature for the aggregate function.
- * @throws AsterixException
+ * @throws CompilationException
*/
private static FunctionSignature internalizeCoreAggregateFunctionName(FunctionSignature fs)
- throws AsterixException {
+ throws CompilationException {
String name = fs.getName().toLowerCase();
boolean coreAgg = name.startsWith(CORE_AGGREGATE_PREFIX);
String lowerCaseName = coreAgg ? name.substring(CORE_AGGREGATE_PREFIX.length())