This is an automated email from the ASF dual-hosted git repository.
ggalvizo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 505a96bce3 [NO-ISSUE][LANG] Small tweaks for language extensions
505a96bce3 is described below
commit 505a96bce384239498d263b85124dd6de2fcfca3
Author: glennga <[email protected]>
AuthorDate: Tue Aug 22 11:18:10 2023 -0700
[NO-ISSUE][LANG] Small tweaks for language extensions
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Weakening visibility for mergeScope in scoping visitor.
- Allowing children of SQL++ function call resolver.
Change-Id: Ib83addfaca52cf63b4ef658b61547e05164ab5bc
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17733
Integration-Tests: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
Reviewed-by: Glenn Galvizo <[email protected]>
---
.../lang/sqlpp/rewrites/visitor/SqlppFunctionCallResolverVisitor.java | 2 +-
.../lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppFunctionCallResolverVisitor.java
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppFunctionCallResolverVisitor.java
index 38b66e260a..2ded389d07 100644
---
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppFunctionCallResolverVisitor.java
+++
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppFunctionCallResolverVisitor.java
@@ -33,7 +33,7 @@ import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
import
org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppSimpleExpressionVisitor;
import org.apache.asterix.om.functions.BuiltinFunctions;
-public final class SqlppFunctionCallResolverVisitor extends
AbstractSqlppSimpleExpressionVisitor {
+public class SqlppFunctionCallResolverVisitor extends
AbstractSqlppSimpleExpressionVisitor {
private final LangRewritingContext context;
diff --git
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java
index 765c2be290..dd48680267 100644
---
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java
+++
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java
@@ -437,7 +437,7 @@ public class AbstractSqlppExpressionScopingVisitor extends
AbstractSqlppSimpleEx
}
// Merges <code>scopeToBeMerged</code> into <code>hostScope</code>.
- private void mergeScopes(Scope hostScope, Scope scopeToBeMerged,
SourceLocation sourceLoc)
+ protected void mergeScopes(Scope hostScope, Scope scopeToBeMerged,
SourceLocation sourceLoc)
throws CompilationException {
Set<String> symbolsToBeMerged = scopeToBeMerged.getLocalSymbols();
for (String symbolToBeMerged : symbolsToBeMerged) {
