Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4CB23200C00 for ; Tue, 3 Jan 2017 17:49:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4B2FB160B43; Tue, 3 Jan 2017 16:49:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D83F0160B46 for ; Tue, 3 Jan 2017 17:49:09 +0100 (CET) Received: (qmail 6593 invoked by uid 500); 3 Jan 2017 16:49:08 -0000 Mailing-List: contact commits-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list commits@asterixdb.apache.org Received: (qmail 6532 invoked by uid 99); 3 Jan 2017 16:49:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2017 16:49:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6F1DFDFBE8; Tue, 3 Jan 2017 16:49:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: buyingyi@apache.org To: commits@asterixdb.apache.org Date: Tue, 03 Jan 2017 16:49:10 -0000 Message-Id: In-Reply-To: <0641ea26a9a64f22bda3cdb9a29ea9b6@git.apache.org> References: <0641ea26a9a64f22bda3cdb9a29ea9b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] asterixdb git commit: ASTERIXDB-1650: fix undefined variable reference resolution. archived-at: Tue, 03 Jan 2017 16:49:12 -0000 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 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1408 Sonar-Qube: Jenkins Tested-by: Jenkins BAD: Jenkins Integration-Tests: Jenkins Reviewed-by: Till Westmann Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/44384a22 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/44384a22 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/44384a22 Branch: refs/heads/master Commit: 44384a22643325bd0d16166d62a7a6d6c6bed3f4 Parents: 95079f2 Author: Yingyi Bu Authored: Mon Jan 2 11:57:30 2017 -0800 Committer: Yingyi Bu Committed: Tue Jan 3 08:48:41 2017 -0800 ---------------------------------------------------------------------- .../optimizer/rules/ResolveVariableRule.java | 38 +-- .../asterix/test/sqlpp/ParserTestUtil.java | 24 +- .../results_parser_sqlpp/denorm-cust-order.ast | 6 +- .../orderby-desc-using-gby.ast | 10 +- .../optimizerts/results_parser_sqlpp/q2.ast | 7 +- .../rtree-index-join/query-issue838.ast | 4 +- .../split-materialization-above-join.ast | 31 ++- .../parserts/results_parser_sqlpp/2.ast | 18 +- .../parserts/results_parser_sqlpp/LetFor.ast | 2 +- .../results_parser_sqlpp/columnalias2.ast | 22 +- .../results_parser_sqlpp/functionDecl1.ast | 2 +- .../results_parser_sqlpp/nestedFLWOGR.ast | 2 +- .../results_parser_sqlpp/nestedFLWOGR3.ast | 18 +- .../conflict-field-dataset-from.1.ddl.sqlpp | 31 +++ .../conflict-field-dataset-from.2.update.sqlpp | 24 ++ .../conflict-field-dataset-from.3.query.sqlpp | 25 ++ .../conflict-field-dataset-fromterm.1.ddl.sqlpp | 31 +++ ...nflict-field-dataset-fromterm.2.update.sqlpp | 24 ++ ...onflict-field-dataset-fromterm.3.query.sqlpp | 25 ++ .../conflict-field-dataset-join.1.ddl.sqlpp | 31 +++ .../conflict-field-dataset-join.2.update.sqlpp | 24 ++ .../conflict-field-dataset-join.3.query.sqlpp | 25 ++ ...onflict-field-dataset-quantifier.1.ddl.sqlpp | 31 +++ ...lict-field-dataset-quantifier.2.update.sqlpp | 24 ++ ...flict-field-dataset-quantifier.3.query.sqlpp | 25 ++ .../conflict-field-dataset-unnest.1.ddl.sqlpp | 31 +++ ...conflict-field-dataset-unnest.2.update.sqlpp | 24 ++ .../conflict-field-dataset-unnest.3.query.sqlpp | 25 ++ .../conflict-field-dataset.1.ddl.sqlpp | 31 +++ .../conflict-field-dataset.2.update.sqlpp | 24 ++ .../conflict-field-dataset.3.query.sqlpp | 24 ++ .../conflict-fields-dataset.1.ddl.sqlpp | 31 +++ .../conflict-fields-dataset.2.update.sqlpp | 24 ++ .../conflict-fields-dataset.3.query.sqlpp | 24 ++ .../fullyqualified/fullyqualified.1.ddl.sqlpp | 34 +++ .../fullyqualified.2.update.sqlpp | 24 ++ .../fullyqualified/fullyqualified.3.query.sqlpp | 24 ++ .../fullyqualified/fullyqualified.4.ddl.sqlpp | 21 ++ .../fullyqualified2/fullyqualified2.1.ddl.sqlpp | 34 +++ .../fullyqualified2.2.update.sqlpp | 24 ++ .../fullyqualified2.3.query.sqlpp | 22 ++ .../fullyqualified2/fullyqualified2.4.ddl.sqlpp | 21 ++ .../conflict-field-dataset-from.1.adm | 1 + .../conflict-field-dataset.1.adm | 1 + .../fullyqualified/fullyqualified.1.adm | 1 + .../fullyqualified2/fullyqualified2.1.adm | 1 + .../fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast | 7 +- .../fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast | 7 +- .../fuzzyjoin/dblp-1_2/dblp-1_2.3.ast | 7 +- .../fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast | 19 +- .../fuzzyjoin/dblp-2.2/dblp-2.3.ast | 6 +- .../fuzzyjoin/dblp-2_2/dblp-2_2.3.ast | 9 +- .../fuzzyjoin/dblp-2_3/dblp-2_3.3.ast | 10 +- .../fuzzyjoin/dblp-2_4/dblp-2_4.3.ast | 11 +- .../fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast | 12 +- .../fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast | 12 +- .../fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast | 12 +- .../fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast | 12 +- .../fuzzyjoin/dblp-2_5/dblp-2_5.3.ast | 12 +- .../fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast | 29 ++- .../fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast | 29 ++- .../fuzzyjoin/dblp-3_1/dblp-3_1.3.ast | 31 ++- .../fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast | 16 +- .../fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast | 41 +++- .../fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast | 44 +++- .../fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast | 47 +++- .../fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast | 65 ++++- .../fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast | 65 ++++- .../dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast | 50 +++- .../fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast | 65 ++++- .../fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast | 50 +++- .../fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast | 16 +- .../fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast | 41 +++- .../fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast | 44 +++- .../fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast | 47 +++- .../fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast | 65 ++++- .../fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast | 65 ++++- .../dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast | 65 ++++- .../fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast | 50 +++- .../dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast | 67 +++++- .../fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast | 67 +++++- .../fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast | 50 +++- .../query-issue456/query-issue456.3.ast | 6 +- .../user-defined-functions/udf30/udf30.1.ast | 2 +- .../resources/runtimets/testsuite_sqlpp.xml | 48 ++++ .../visitor/VariableCheckAndRewriteVisitor.java | 53 ++-- .../CheckDatasetOnlyResolutionVisitor.java | 239 +++++++++++++++++++ 87 files changed, 2314 insertions(+), 229 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ResolveVariableRule.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ResolveVariableRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ResolveVariableRule.java index 2d36a4e..f8e57a1 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ResolveVariableRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ResolveVariableRule.java @@ -51,10 +51,17 @@ import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCall import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; /** - * This rule resolves references to undefined identifiers as: - * 1. expression + field-access paths, or + * This rule resolves references to undefined identifiers with the following priority: + * 1. field-access * 2. datasets * based on the available type and metadata information. + * + * + * Note that undefined variable references that are FROM/JOIN/UNNEST/Quantifier binding expressions + * are resolved to dataset only, which has been done in + * + * @see org.apache.asterix.lang.sqlpp.rewrites.visitor.VariableCheckAndRewriteVisitor + * */ public class ResolveVariableRule implements IAlgebraicRewriteRule { @@ -144,12 +151,16 @@ public class ResolveVariableRule implements IAlgebraicRewriteRule { Mutable parentFuncRef, IOptimizationContext context) throws AlgebricksException { AbstractFunctionCallExpression func = (AbstractFunctionCallExpression) funcRef.getValue(); int numVarCandidates = varAccessCandidates.size(); - boolean hasAmbiguity = hasAmbiguity(hasMatchedDataset, fullyQualifiedDatasetPathCandidateFromParent, - numVarCandidates); - if (hasAmbiguity) { - // More than one possibilities. - throw new AlgebricksException("Cannot resolve ambiguous alias reference for undefined identifier " - + unresolvedVarName); + + // The resolution order: 1. field-access 2. datasets (standalone-name or fully-qualified) + if (numVarCandidates > 0) { + if (numVarCandidates == 1) { + resolveAsFieldAccess(funcRef, varAccessCandidates.iterator().next()); + } else { + // More than one possibilities. + throw new AlgebricksException( + "Cannot resolve ambiguous alias reference for undefined identifier " + unresolvedVarName); + } } else if (hasMatchedDataset) { // Rewrites the "resolve" function to a "dataset" function and only keep the dataset name argument. func.setFunctionInfo(FunctionUtil.getFunctionInfo(BuiltinFunctions.DATASET)); @@ -165,8 +176,6 @@ public class ResolveVariableRule implements IAlgebraicRewriteRule { new MutableObject<>(new ConstantExpression( new AsterixConstantValue(new AString(fullyQualifiedDatasetPathCandidateFromParent.second + "." + fullyQualifiedDatasetPathCandidateFromParent.third))))); - } else if (numVarCandidates == 1) { - resolveAsFieldAccess(funcRef, varAccessCandidates.iterator().next()); } else { MetadataProvider metadataProvider = (MetadataProvider) context.getMetadataProvider(); // Cannot find any resolution. @@ -176,15 +185,6 @@ public class ResolveVariableRule implements IAlgebraicRewriteRule { return true; } - // Check whether it is possible to have multiple resolutions for a "resolve" function. - private boolean hasAmbiguity(boolean hasMatchedDataset, - Triple fullyQualifiedDatasetPathCandidateFromParent, int numVarCandidates) { - boolean hasAmbiguity = numVarCandidates > 1 || (numVarCandidates == 1 && hasMatchedDataset); - hasAmbiguity = hasAmbiguity || (numVarCandidates == 1 && fullyQualifiedDatasetPathCandidateFromParent.first); - hasAmbiguity = hasAmbiguity || (hasMatchedDataset && fullyQualifiedDatasetPathCandidateFromParent.first); - return hasAmbiguity; - } - // Resolves a "resolve" function call as a field access. private void resolveAsFieldAccess(Mutable funcRef, Pair> varAndPath) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java index 5e60af3..891e463 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java @@ -30,21 +30,21 @@ import org.junit.internal.AssumptionViolatedException; class ParserTestUtil { - static void suiteBuild(File dir, Collection testArgs, String path, String separator, + static void suiteBuild(File file, Collection testArgs, String path, String separator, String extensionQuery, String extensionResult, String pathExpected, String pathActual) { - for (File file : dir.listFiles()) { - if (file.isDirectory() && !file.getName().startsWith(".")) { - suiteBuild(file, testArgs, TestHelper.joinPath(path, file.getName()), separator, extensionQuery, - extensionResult, pathExpected, pathActual); - } - if (file.isFile() && file.getName().endsWith(extensionQuery)) { - String resultFileName = AsterixTestHelper.extToResExt(file.getName(), extensionResult); - File expectedFile = new File(TestHelper.joinPath(pathExpected, path, resultFileName)); - File actualFile = new File( - TestHelper.joinPath(pathActual, path.replace(separator, "_"), resultFileName)); - testArgs.add(new Object[] { file, expectedFile, actualFile }); + if (file.isDirectory() && !file.getName().startsWith(".")) { + for (File innerfile : file.listFiles()) { + String subdir = innerfile.isDirectory() ? TestHelper.joinPath(path, innerfile.getName()) : path; + suiteBuild(innerfile, testArgs, subdir, separator, extensionQuery, extensionResult, pathExpected, + pathActual); } } + if (file.isFile() && file.getName().endsWith(extensionQuery)) { + String resultFileName = AsterixTestHelper.extToResExt(file.getName(), extensionResult); + File expectedFile = new File(TestHelper.joinPath(pathExpected, path, resultFileName)); + File actualFile = new File(TestHelper.joinPath(pathActual, path, resultFileName)); + testArgs.add(new Object[] { file, expectedFile, actualFile }); + } } protected static void runTest(Logger logger, ParserTestExecutor parserTestExecutor, String pathQueries, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast index 1d263cf..543f691 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast @@ -43,8 +43,12 @@ RecordConstructor [ ( LiteralExpr [STRING] [cust] : - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [cust] + Variable [ Name=$cid ] + Variable [ Name=$o ] + Variable [ Name=#1 ] + Variable [ Name=$c ] ] ) ( http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast index e92496d..d50f774 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast @@ -32,8 +32,11 @@ RecordConstructor [ ( LiteralExpr [STRING] [age] : - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [age] + Variable [ Name=$name ] + Variable [ Name=#1 ] + Variable [ Name=$c ] ] ) ] @@ -58,8 +61,11 @@ Groupby Orderby Variable [ Name=$name ] DESC - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [age] + Variable [ Name=$name ] + Variable [ Name=#1 ] + Variable [ Name=$c ] ] ASC http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast index 1b01e10..adb9a05 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast @@ -94,8 +94,13 @@ Let Variable [ Name=$sig_sponsorship_count ] FunctionCall events.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [es] + Variable [ Name=$sponsor ] + Variable [ Name=$event ] + Variable [ Name=$sig_name ] + Variable [ Name=#1 ] + Variable [ Name=#2 ] ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast index 8868c2f..7c28623 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast @@ -61,8 +61,10 @@ FROM [ FunctionCall Metadata.dataset@1[ Let Variable [ Name=$circle ] := FunctionCall twitter.create-circle@2[ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [location] + Variable [ Name=$tweet ] + Variable [ Name=$sub ] ] LiteralExpr [DOUBLE] [30.0] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast index 5c76658..76447cd 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast @@ -60,8 +60,19 @@ FROM [ FunctionCall Metadata.dataset@1[ LiteralExpr [STRING] [sim] : IndexAccessor [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [sim] + Variable [ Name=#5 ] + Variable [ Name=$lenLeft ] + Variable [ Name=$idLeft ] + Variable [ Name=$lenRight ] + Variable [ Name=$tokensLeft ] + Variable [ Name=$prefixTokenRight ] + Variable [ Name=$tokensRight ] + Variable [ Name=$paperLeft ] + Variable [ Name=$paperRight ] + Variable [ Name=$idRight ] + Variable [ Name=$prefixTokenLeft ] ] Index: LiteralExpr [LONG] [0] ] @@ -74,13 +85,17 @@ FROM [ FunctionCall Metadata.dataset@1[ AS Variable [ Name=$paperLeft ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [tokensLeft] + Variable [ Name=$paperLeft ] + Variable [ Name=$paperRight ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [lenLeft] + Variable [ Name=$paperLeft ] + Variable [ Name=$paperRight ] ] LiteralExpr [FLOAT] [0.5] ] @@ -93,13 +108,19 @@ FROM [ FunctionCall Metadata.dataset@1[ AS Variable [ Name=$paperRight ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [tokensRight] + Variable [ Name=$paperLeft ] + Variable [ Name=$paperRight ] + Variable [ Name=$prefixTokenLeft ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [lenRight] + Variable [ Name=$paperLeft ] + Variable [ Name=$paperRight ] + Variable [ Name=$prefixTokenLeft ] ] LiteralExpr [FLOAT] [0.5] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast index a5cdcdf..5471490 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast @@ -61,8 +61,13 @@ Let Variable [ Name=$sig_sponsorship_count ] FunctionCall null.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [es] + Variable [ Name=$sponsor ] + Variable [ Name=$event ] + Variable [ Name=$sig_name ] + Variable [ Name=#1 ] + Variable [ Name=#2 ] ] ] FROM [ Variable [ Name=#1 ] @@ -86,8 +91,17 @@ Let Variable [ Name=$by_chapter ] FunctionCall null.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [es] + Variable [ Name=#4 ] + Variable [ Name=$e ] + Variable [ Name=$sponsor ] + Variable [ Name=$sig_sponsorship_count ] + Variable [ Name=$chapter_name ] + Variable [ Name=$event ] + Variable [ Name=$sig_name ] + Variable [ Name=#1 ] + Variable [ Name=#3 ] ] ] FROM [ Variable [ Name=#3 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast index 68d47d8..5211b72 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast @@ -1,7 +1,7 @@ Query: Let Variable [ Name=$users ] := - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [User] ] SELECT ELEMENT [ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast index 3177516..78238d1 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast @@ -2,12 +2,26 @@ Query: SELECT [ FunctionCall null.sqrt@1[ OperatorExpr [ - FunctionCall Metadata.dataset@1[ - LiteralExpr [STRING] [t.a] + FieldAccessor [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [t] + Variable [ Name=$u ] + Variable [ Name=$root ] + Variable [ Name=#1 ] + Variable [ Name=$id ] + ] + Field=a ] * - FunctionCall Metadata.dataset@1[ - LiteralExpr [STRING] [t.b] + FieldAccessor [ + FunctionCall Metadata.resolve@-1[ + LiteralExpr [STRING] [t] + Variable [ Name=$u ] + Variable [ Name=$root ] + Variable [ Name=#1 ] + Variable [ Name=$id ] + ] + Field=b ] ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast index 435d2f0..b14e49b 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast @@ -102,7 +102,7 @@ Query: Let Variable [ Name=$result ] := FunctionCall null.calculate@1[ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [Events] ] ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast index 2f246e1..aa422a1 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast @@ -14,7 +14,7 @@ RecordConstructor [ FROM [ ( Let Variable [ Name=$data ] := - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [User] ] SELECT ELEMENT [ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast index 9454ebc..af44c39 100644 --- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast +++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast @@ -61,8 +61,13 @@ Let Variable [ Name=$sig_sponsorship_count ] FunctionCall null.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [es] + Variable [ Name=$sponsor ] + Variable [ Name=$event ] + Variable [ Name=$sig_name ] + Variable [ Name=#1 ] + Variable [ Name=#2 ] ] ] FROM [ Variable [ Name=#1 ] @@ -86,8 +91,17 @@ Let Variable [ Name=$by_chapter ] FunctionCall null.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [es] + Variable [ Name=#4 ] + Variable [ Name=$e ] + Variable [ Name=$sponsor ] + Variable [ Name=$sig_sponsorship_count ] + Variable [ Name=$chapter_name ] + Variable [ Name=$event ] + Variable [ Name=$sig_name ] + Variable [ Name=#1 ] + Variable [ Name=#3 ] ] ] FROM [ Variable [ Name=#3 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.1.ddl.sqlpp new file mode 100644 index 0000000..02c9795 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.1.ddl.sqlpp @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test if exists; +create dataverse test; +use test; + +drop dataset samptable if exists; +drop type samptabletype if exists; + +create type samptabletype as { + id: tinyint +}; + +create dataset samptable(samptabletype) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.2.update.sqlpp new file mode 100644 index 0000000..e08ad9a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.2.update.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +insert into samptable ({'id' : 0}); + +insert into samptable ({'id' : 1, 'samptable': 2}); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.3.query.sqlpp new file mode 100644 index 0000000..097c57d --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-from/conflict-field-dataset-from.3.query.sqlpp @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +select * +from samptable s +where samptable >= (select value count(*) from samptable s2)[0]; + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.1.ddl.sqlpp new file mode 100644 index 0000000..02c9795 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.1.ddl.sqlpp @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test if exists; +create dataverse test; +use test; + +drop dataset samptable if exists; +drop type samptabletype if exists; + +create type samptabletype as { + id: tinyint +}; + +create dataset samptable(samptabletype) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.2.update.sqlpp new file mode 100644 index 0000000..e08ad9a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.2.update.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +insert into samptable ({'id' : 0}); + +insert into samptable ({'id' : 1, 'samptable': 2}); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.3.query.sqlpp new file mode 100644 index 0000000..53cae61 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-fromterm/conflict-field-dataset-fromterm.3.query.sqlpp @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +select * +from samptable s +where samptable >= (select value count(*) from samptable s2, samptable s3 where s2.id=s3.id)[0]; + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.1.ddl.sqlpp new file mode 100644 index 0000000..02c9795 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.1.ddl.sqlpp @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test if exists; +create dataverse test; +use test; + +drop dataset samptable if exists; +drop type samptabletype if exists; + +create type samptabletype as { + id: tinyint +}; + +create dataset samptable(samptabletype) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.2.update.sqlpp new file mode 100644 index 0000000..e08ad9a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.2.update.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +insert into samptable ({'id' : 0}); + +insert into samptable ({'id' : 1, 'samptable': 2}); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.3.query.sqlpp new file mode 100644 index 0000000..7d3c8d3 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-join/conflict-field-dataset-join.3.query.sqlpp @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +select * +from samptable s +where samptable >= (select value count(*) from samptable s2 join samptable s3 on s2.id=s3.id)[0]; + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.1.ddl.sqlpp new file mode 100644 index 0000000..02c9795 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.1.ddl.sqlpp @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test if exists; +create dataverse test; +use test; + +drop dataset samptable if exists; +drop type samptabletype if exists; + +create type samptabletype as { + id: tinyint +}; + +create dataset samptable(samptabletype) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.2.update.sqlpp new file mode 100644 index 0000000..e08ad9a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.2.update.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +insert into samptable ({'id' : 0}); + +insert into samptable ({'id' : 1, 'samptable': 2}); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.3.query.sqlpp new file mode 100644 index 0000000..8b5a409 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-quantifier/conflict-field-dataset-quantifier.3.query.sqlpp @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +select * +from samptable s +where some s2 in samptable satisfies s2.samptable=s.samptable; + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.1.ddl.sqlpp new file mode 100644 index 0000000..02c9795 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.1.ddl.sqlpp @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test if exists; +create dataverse test; +use test; + +drop dataset samptable if exists; +drop type samptabletype if exists; + +create type samptabletype as { + id: tinyint +}; + +create dataset samptable(samptabletype) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.2.update.sqlpp new file mode 100644 index 0000000..e08ad9a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.2.update.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +insert into samptable ({'id' : 0}); + +insert into samptable ({'id' : 1, 'samptable': 2}); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.3.query.sqlpp new file mode 100644 index 0000000..6b26164 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset-unnest/conflict-field-dataset-unnest.3.query.sqlpp @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +select * +from samptable s +where samptable >= (select value count(*) from samptable s2 unnest samptable s3 where s2.id=s3.id)[0]; + http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.1.ddl.sqlpp new file mode 100644 index 0000000..02c9795 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.1.ddl.sqlpp @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test if exists; +create dataverse test; +use test; + +drop dataset samptable if exists; +drop type samptabletype if exists; + +create type samptabletype as { + id: tinyint +}; + +create dataset samptable(samptabletype) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.2.update.sqlpp new file mode 100644 index 0000000..10fda39 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.2.update.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +insert into samptable ({'id' : 0}); + +insert into samptable ({'id' : 1, 'samptable': 1}); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.3.query.sqlpp new file mode 100644 index 0000000..2ac14e5 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-field-dataset/conflict-field-dataset.3.query.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +select * +from samptable s +where samptable > 0; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.1.ddl.sqlpp new file mode 100644 index 0000000..02c9795 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.1.ddl.sqlpp @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test if exists; +create dataverse test; +use test; + +drop dataset samptable if exists; +drop type samptabletype if exists; + +create type samptabletype as { + id: tinyint +}; + +create dataset samptable(samptabletype) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.2.update.sqlpp new file mode 100644 index 0000000..10fda39 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.2.update.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +insert into samptable ({'id' : 0}); + +insert into samptable ({'id' : 1, 'samptable': 1}); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.3.query.sqlpp new file mode 100644 index 0000000..2645ddc --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/conflict-fields-dataset/conflict-fields-dataset.3.query.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +select * +from samptable s1, samptable s2 +where samptable > 0; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.1.ddl.sqlpp new file mode 100644 index 0000000..f9c0dff --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.1.ddl.sqlpp @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test1 if exists; +create dataverse test1; + +drop dataverse test if exists; +create dataverse test; +use test; + +drop dataset samptable if exists; +drop type samptabletype if exists; + +create type samptabletype as closed { + id: tinyint +}; + +create dataset samptable(samptabletype) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.2.update.sqlpp new file mode 100644 index 0000000..bd1d4df --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.2.update.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +insert into samptable ({'id' : 0}); + +insert into samptable ({'id' : 1}); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.3.query.sqlpp new file mode 100644 index 0000000..f42f4f9 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.3.query.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test1; + +select * +from test.samptable +where id > 0; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.4.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.4.ddl.sqlpp new file mode 100644 index 0000000..ae4aef6 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.4.ddl.sqlpp @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test1; +drop dataverse test; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.1.ddl.sqlpp new file mode 100644 index 0000000..f9c0dff --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.1.ddl.sqlpp @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test1 if exists; +create dataverse test1; + +drop dataverse test if exists; +create dataverse test; +use test; + +drop dataset samptable if exists; +drop type samptabletype if exists; + +create type samptabletype as closed { + id: tinyint +}; + +create dataset samptable(samptabletype) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.2.update.sqlpp new file mode 100644 index 0000000..bd1d4df --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.2.update.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +insert into samptable ({'id' : 0}); + +insert into samptable ({'id' : 1}); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.3.query.sqlpp new file mode 100644 index 0000000..7a44bfe --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.3.query.sqlpp @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test1; + +coll_count(test.samptable); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.4.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.4.ddl.sqlpp new file mode 100644 index 0000000..ae4aef6 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.4.ddl.sqlpp @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +drop dataverse test1; +drop dataverse test; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset-from/conflict-field-dataset-from.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset-from/conflict-field-dataset-from.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset-from/conflict-field-dataset-from.1.adm new file mode 100644 index 0000000..74f408a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset-from/conflict-field-dataset-from.1.adm @@ -0,0 +1 @@ +{ "s": { "id": 1, "samptable": 2 } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset/conflict-field-dataset.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset/conflict-field-dataset.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset/conflict-field-dataset.1.adm new file mode 100644 index 0000000..d18543e --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/conflict-field-dataset/conflict-field-dataset.1.adm @@ -0,0 +1 @@ +{ "s": { "id": 1, "samptable": 1 } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified/fullyqualified.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified/fullyqualified.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified/fullyqualified.1.adm new file mode 100644 index 0000000..1c21252 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified/fullyqualified.1.adm @@ -0,0 +1 @@ +{ "samptable": { "id": 1 } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified2/fullyqualified2.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified2/fullyqualified2.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified2/fullyqualified2.1.adm new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/resolution/fullyqualified2/fullyqualified2.1.adm @@ -0,0 +1 @@ +2 http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast index 1d14a93..9701e92 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast @@ -37,8 +37,13 @@ Orderby FunctionCall fuzzyjoin.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [id] + Variable [ Name=$token ] + Variable [ Name=$paper ] + Variable [ Name=$tokenGroupped ] + Variable [ Name=#1 ] + Variable [ Name=#2 ] ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast index 1d14a93..9701e92 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast @@ -37,8 +37,13 @@ Orderby FunctionCall fuzzyjoin.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [id] + Variable [ Name=$token ] + Variable [ Name=$paper ] + Variable [ Name=$tokenGroupped ] + Variable [ Name=#1 ] + Variable [ Name=#2 ] ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast index 7306e80..d8aa69e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast @@ -37,8 +37,13 @@ Orderby FunctionCall fuzzyjoin.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [paperid] + Variable [ Name=$token ] + Variable [ Name=$paper ] + Variable [ Name=$tokenGroupped ] + Variable [ Name=#1 ] + Variable [ Name=#2 ] ] ] FROM [ Variable [ Name=#1 ] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44384a22/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast index fb7aaec..8d8e432 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast @@ -26,13 +26,15 @@ FROM [ FunctionCall Metadata.dataset@1[ AS Variable [ Name=$paperDBLP ] , FunctionCall fuzzyjoin.subset-collection@3[ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [tokensDBLP] + Variable [ Name=$paperDBLP ] ] LiteralExpr [LONG] [0] FunctionCall fuzzyjoin.prefix-len-jaccard@2[ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [lenDBLP] + Variable [ Name=$paperDBLP ] ] LiteralExpr [FLOAT] [0.5] ] @@ -104,8 +106,19 @@ Let Variable [ Name=$tokensDBLP ] FunctionCall fuzzyjoin.sql-count@1[ ( SELECT ELEMENT [ - FunctionCall Metadata.dataset@1[ + FunctionCall Metadata.resolve@-1[ LiteralExpr [STRING] [id] + Variable [ Name=$lenDBLP ] + Variable [ Name=$token ] + Variable [ Name=$tokensUnrankedDBLP ] + Variable [ Name=$paper ] + Variable [ Name=$tokenGroupped ] + Variable [ Name=$prefixTokenDBLP ] + Variable [ Name=$paperDBLP ] + Variable [ Name=$tokenUnranked ] + Variable [ Name=#1 ] + Variable [ Name=#2 ] + Variable [ Name=$idDBLP ] ] ] FROM [ Variable [ Name=#1 ]