Hello Jenkins,

I'd like you to reexamine a change.  Please visit

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

to look at the new patch set (#2).

Change subject: ASTERIXDB-1650: fix undefined variable reference resolution.
......................................................................

ASTERIXDB-1650: fix undefined variable reference resolution.

The order of resolving a reference to an undefined variable is:
-- If the reference to an undefined variable is the binding expression for 
FROM/JOIN/UNNEST/Quantifier,
   then it can only be resolved to a dataset;
-- Otherwise, it is firstly resolved as a field-access. If the system couldn't 
find a candidate
   field access, it is then resolved to a dataset.

Change-Id: I24e4c1b38e53c97380cfb3e2e9b61cdd05fe7002
---
M 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ResolveVariableRule.java
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.1.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.2.update.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.3.query.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset2/conflict-field-dataset2.1.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset2/conflict-field-dataset2.2.update.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset2/conflict-field-dataset2.3.query.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset3/conflict-field-dataset3.1.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset3/conflict-field-dataset3.2.update.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset3/conflict-field-dataset3.3.query.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset4/conflict-field-dataset4.1.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset4/conflict-field-dataset4.2.update.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset4/conflict-field-dataset4.3.query.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset5/conflict-field-dataset5.1.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset5/conflict-field-dataset5.2.update.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset5/conflict-field-dataset5.3.query.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset6/conflict-field-dataset6.1.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset6/conflict-field-dataset6.2.update.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset6/conflict-field-dataset6.3.query.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.1.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.2.update.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.3.query.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.1.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.2.update.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.3.query.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.4.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.1.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.2.update.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.3.query.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.4.ddl.sqlpp
A 
asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset/conflict-field-dataset.1.adm
A 
asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset2/conflict-field-dataset2.1.adm
A 
asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified/fullyqualified.1.adm
A 
asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified2/fullyqualified2.1.adm
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M 
asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java
A 
asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckDatasetOnlyResolutionVisitor.java
37 files changed, 1,107 insertions(+), 33 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/08/1408/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1408
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I24e4c1b38e53c97380cfb3e2e9b61cdd05fe7002
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>

Reply via email to