Add Default Dataverse and AnyObject Datatype This change adds "Default" dataverse and Metadata.AnyObject type which is the completely open record type. In addition, this change cleansup between subsequent test cases lowering the chance that a failed test causes the following tests to fail. In addition, it prints out the list of tests which left some leftover.
Change-Id: Ie02c74c8b005dce73888afd4dfe19ede2c60a8e8 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1174 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Till Westmann <ti...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e4b318f6 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e4b318f6 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e4b318f6 Branch: refs/heads/master Commit: e4b318f650379daa8b3c6fc133ee5f7c5bcafc41 Parents: 4b30d79 Author: Abdullah Alamoudi <bamou...@gmail.com> Authored: Mon Sep 19 13:31:25 2016 +0300 Committer: abdullah alamoudi <bamou...@gmail.com> Committed: Mon Sep 19 12:14:42 2016 -0700 ---------------------------------------------------------------------- .gitignore | 9 - .../asterix/translator/IStatementExecutor.java | 10 + .../asterix/translator/TypeTranslator.java | 75 +++--- .../asterix-algebra/src/main/javacc/AQLPlus.jj | 3 +- .../asterix/app/translator/QueryTranslator.java | 18 +- .../bootstrap/NCApplicationEntryPoint.java | 6 - .../asterix/test/metadata/MetadataTest.java | 2 +- .../asterix/test/optimizer/OptimizerTest.java | 2 +- .../asterix/test/runtime/ExecutionTest.java | 15 +- .../test/runtime/SqlppExecutionTest.java | 12 +- .../asterix/test/sqlpp/OptimizerParserTest.java | 5 +- .../asterix/test/sqlpp/ParserTestExecutor.java | 11 +- .../asterix/test/sqlpp/RuntimeParserTest.java | 2 +- .../asterix/test/sqlpp/SmokeParserTest.java | 2 +- .../metadata/results/basic/meta01/meta01.1.adm | 1 + .../metadata_datatype/metadata_datatype.1.adm | 1 + .../metadata_dataverse/metadata_dataverse.1.adm | 1 + .../drop-dataverse/drop-dataverse.3.ddl.aql | 27 +++ .../drop-type-used-elsewhere.3.ddl.aql | 29 +++ .../query-dataset-with-foreign-type.4.ddl.aql | 27 +++ .../load-with-index-open_02.4.ddl.aql | 20 ++ .../dml/query-issue382/query-issue382.4.ddl.aql | 19 ++ .../load/escapes-err-1/escapes-err-1.3.ddl.aql | 19 ++ .../queries/load/escapes01/escapes01.4.ddl.aql | 19 ++ .../queries/load/escapes02/escapes02.4.ddl.aql | 19 ++ .../load_non-empty_index.3.ddl.aql | 24 ++ .../type_promotion_0/type_promotion_0.4.ddl.aql | 19 ++ .../queries/misc/flushtest/flushtest.5.ddl.aql | 19 ++ .../query-issue208/query-issue208.4.ddl.aql | 26 ++ .../query-issue236/query-issue236.4.ddl.aql | 26 ++ .../types/any-object/any-object.1.ddl.aql | 25 ++ .../types/any-object/any-object.2.query.aql | 21 ++ .../issue1587-foreignDataType.4.ddl.aql | 25 ++ .../misc/flushtest/flushtest.5.ddl.sqlpp | 20 ++ .../order-by-exception_02.4.query.sqlpp | 3 +- .../types/any-object/any-object.1.ddl.sqlpp | 25 ++ .../types/any-object/any-object.2.query.sqlpp | 20 ++ .../results/types/any-object/any-object.2.adm | 68 ++++++ .../comparison/binary_null/binary_null.2.ast | 0 .../comparison/binary_null/binary_null.3.ast | 100 -------- .../comparison/int16_null/int16_null.2.ast | 0 .../comparison/int16_null/int16_null.3.ast | 100 -------- .../load/adm_binary/adm_bianry.2.ast | 1 + .../load/adm_binary/adm_bianry.3.ast | 10 + .../load/adm_binary/adm_binary.2.ast | 1 - .../load/adm_binary/adm_binary.3.ast | 10 - .../duplicate-key-error.1.ast | 7 - .../duplicate-key-error.2.ast | 1 - .../load/escapes-err-1/escapes-err-1.1.ast | 7 - .../load/escapes-err-1/escapes-err-1.2.ast | 1 - .../load/issue14_query/issue14_query.1.ast | 9 - .../load/issue14_query/issue14_query.2.ast | 1 - .../load/issue14_query/issue14_query.3.ast | 10 - .../load/issue315_query/issue315_query.1.ast | 9 - .../load/issue315_query/issue315_query.2.ast | 1 - .../load/issue650_query/issue650_query.1.ast | 12 - .../load/issue650_query/issue650_query.2.ast | 1 - .../misc/flushtest/flushtest.5.ast | 0 .../numeric/add_double/add_double.2.ast | 0 .../numeric/add_double/add_double.3.ast | 98 -------- .../numeric/add_float/add_float.2.ast | 0 .../numeric/add_float/add_float.3.ast | 98 -------- .../numeric/add_int16/add_int16.2.ast | 0 .../numeric/add_int16/add_int16.3.ast | 98 -------- .../numeric/add_int32/add_int32.2.ast | 0 .../numeric/add_int32/add_int32.3.ast | 98 -------- .../numeric/add_int64/add_int64.2.ast | 0 .../numeric/add_int64/add_int64.3.ast | 98 -------- .../numeric/add_int8/add_int8.2.ast | 0 .../numeric/add_int8/add_int8.3.ast | 98 -------- .../numeric/divide_double/divide_double.2.ast | 0 .../numeric/divide_double/divide_double.3.ast | 98 -------- .../numeric/divide_float/divide_float.2.ast | 0 .../numeric/divide_float/divide_float.3.ast | 98 -------- .../numeric/divide_int16/divide_int16.2.ast | 0 .../numeric/divide_int16/divide_int16.3.ast | 98 -------- .../numeric/divide_int32/divide_int32.2.ast | 0 .../numeric/divide_int32/divide_int32.3.ast | 98 -------- .../numeric/divide_int64/divide_int64.2.ast | 0 .../numeric/divide_int64/divide_int64.3.ast | 98 -------- .../numeric/divide_int8/divide_int8.2.ast | 0 .../numeric/divide_int8/divide_int8.3.ast | 98 -------- .../numeric/multiply_double.ast | 103 -------- .../multiply_double/multiply_double.2.ast | 0 .../multiply_double/multiply_double.3.ast | 98 -------- .../numeric/multiply_float.ast | 104 -------- .../numeric/multiply_float/multiply_float.2.ast | 0 .../numeric/multiply_float/multiply_float.3.ast | 98 -------- .../numeric/multiply_int16.ast | 103 -------- .../numeric/multiply_int16/multiply_int16.2.ast | 0 .../numeric/multiply_int16/multiply_int16.3.ast | 98 -------- .../numeric/multiply_int32.ast | 103 -------- .../numeric/multiply_int32/multiply_int32.2.ast | 0 .../numeric/multiply_int32/multiply_int32.3.ast | 98 -------- .../numeric/multiply_int64.ast | 104 -------- .../numeric/multiply_int64/multiply_int64.2.ast | 0 .../numeric/multiply_int64/multiply_int64.3.ast | 98 -------- .../numeric/multiply_int8.ast | 103 -------- .../numeric/multiply_int8/multiply_int8.2.ast | 0 .../numeric/multiply_int8/multiply_int8.3.ast | 98 -------- .../subtract_double/subtract_double.2.ast | 0 .../subtract_double/subtract_double.3.ast | 98 -------- .../numeric/subtract_float/subtract_float.2.ast | 0 .../numeric/subtract_float/subtract_float.3.ast | 98 -------- .../numeric/subtract_int16/subtract_int16.2.ast | 0 .../numeric/subtract_int16/subtract_int16.3.ast | 98 -------- .../numeric/subtract_int32/subtract_int32.2.ast | 0 .../numeric/subtract_int32/subtract_int32.3.ast | 98 -------- .../numeric/subtract_int64/subtract_int64.2.ast | 0 .../numeric/subtract_int64/subtract_int64.3.ast | 98 -------- .../numeric/subtract_int8/subtract_int8.2.ast | 0 .../numeric/subtract_int8/subtract_int8.3.ast | 98 -------- .../unary-minus_null/unary-minus_null.2.ast | 0 .../unary-minus_null/unary-minus_null.3.ast | 14 -- .../order-by-exception_01.1.ast | 11 - .../order-by-exception_01.2.ast | 2 - .../order-by-exception_01.3.ast | 1 - .../order-by-exception_01.4.ast | 17 -- .../order-by-exception_02.1.ast | 11 - .../order-by-exception_02.2.ast | 2 - .../order-by-exception_02.3.ast | 1 - .../order-by-exception_02.4.ast | 17 -- .../string/end-with1/end-with1.1.ast | 0 .../string/end-with1/end-with1.2.ast | 0 .../string/end-with1/end-with1.3.ast | 12 - .../string/end-with2/end-with2.1.ast | 0 .../string/end-with2/end-with2.2.ast | 0 .../string/end-with2/end-with2.3.ast | 12 - .../string/end-with3/end-with3.1.ast | 0 .../string/end-with3/end-with3.2.ast | 0 .../string/end-with3/end-with3.3.ast | 12 - .../string/end-with4/end-with4.1.ast | 0 .../string/end-with4/end-with4.2.ast | 0 .../string/end-with4/end-with4.3.ast | 12 - .../string/end-with5/end-with5.1.ast | 0 .../string/end-with5/end-with5.2.ast | 0 .../string/end-with5/end-with5.3.ast | 52 ---- .../string/ends-with_01/ends-with_01.1.ast | 0 .../string/ends-with_01/ends-with_01.2.ast | 0 .../string/ends-with_01/ends-with_01.3.ast | 26 -- .../string/endwith02/endwith02.1.ast | 0 .../string/endwith02/endwith02.2.ast | 0 .../string/endwith02/endwith02.3.ast | 43 ---- .../string/endwith03/endwith03.1.ast | 7 - .../string/endwith03/endwith03.2.ast | 1 - .../string/endwith03/endwith03.3.ast | 26 -- .../string/start-with1/start-with1.1.ast | 0 .../string/start-with1/start-with1.2.ast | 0 .../string/start-with1/start-with1.3.ast | 12 - .../string/start-with2/start-with2.1.ast | 0 .../string/start-with2/start-with2.2.ast | 0 .../string/start-with2/start-with2.3.ast | 12 - .../string/start-with3/start-with3.1.ast | 0 .../string/start-with3/start-with3.2.ast | 0 .../string/start-with3/start-with3.3.ast | 12 - .../string/start-with4/start-with4.1.ast | 0 .../string/start-with4/start-with4.2.ast | 0 .../string/start-with4/start-with4.3.ast | 52 ---- .../string/start-with5/start-with5.1.ast | 0 .../string/start-with5/start-with5.2.ast | 0 .../string/start-with5/start-with5.3.ast | 12 - .../string/starts-with_01/starts-with_01.1.ast | 0 .../string/starts-with_01/starts-with_01.2.ast | 0 .../string/starts-with_01/starts-with_01.3.ast | 26 -- .../string/startwith02/startwith02.1.ast | 0 .../string/startwith02/startwith02.2.ast | 0 .../string/startwith02/startwith02.3.ast | 77 ------ .../tinysocial-suite-open/aggregate.27.ast | 105 -------- .../tinysocial-suite-open/group-by.26.ast | 119 --------- .../query-ASTERIXDB-1263.23.ast | 81 ------- .../query-ASTERIXDB-1329.24.ast | 84 ------- .../query-ASTERIXDB-1331.25.ast | 41 ---- .../tinysocial-suite.23.ast | 81 +++++++ .../tinysocial-suite.24.ast | 84 +++++++ .../tinysocial-suite.25.ast | 41 ++++ .../tinysocial-suite.26.ast | 119 +++++++++ .../tinysocial-suite.27.ast | 105 ++++++++ .../query-ASTERIXDB-1263.23.ast | 81 ------- .../tinysocial-suite/tinysocial-suite.23.ast | 81 +++++++ .../union/union/union.1.ast | 13 - .../union/union/union.2.ast | 1 - .../union/union/union.3.ast | 0 .../src/test/resources/runtimets/testsuite.xml | 5 + .../resources/runtimets/testsuite_sqlpp.xml | 7 +- .../apache/asterix/test/aql/TestExecutor.java | 90 +++++-- .../asterix/test/base/ComparisonException.java | 27 +++ .../installer/test/AbstractExecutionIT.java | 19 +- .../test/AsterixClusterLifeCycleIT.java | 2 +- .../test/AsterixExternalLibraryIT.java | 2 +- .../installer/test/AsterixLifecycleIT.java | 2 +- .../asterix/installer/test/ReplicationIT.java | 2 +- .../installer/transaction/DmlRecoveryIT.java | 5 +- .../installer/transaction/RecoveryIT.java | 3 +- .../dataverseDataset/dataverseDataset.1.adm | 1 + .../asterix-lang-aql/src/main/javacc/AQL.jj | 10 +- .../expression/TypeReferenceExpression.java | 7 +- .../lang/common/visitor/FormatPrintVisitor.java | 6 +- .../lang/common/visitor/QueryPrintVisitor.java | 6 +- .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 10 +- .../metadata/bootstrap/MetadataBootstrap.java | 243 +++++++++++-------- .../bootstrap/MetadataBuiltinEntities.java | 44 ++++ .../metadata/utils/MetadataConstants.java | 8 +- .../server/test/NCServiceExecutionIT.java | 28 ++- .../dataverseDataset/dataverseDataset.1.adm | 1 + 204 files changed, 1490 insertions(+), 4484 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index ba4e894..2dfbf0f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,21 +5,12 @@ target .settings .project ClusterControllerService -rttest -mdtest -ittest asterix_logs build asterixdb/asterix-opt asterixdb/asterix-app/src/test/resources/externallib -asterixdb/asterix-app/opttest -asterixdb/asterix-app/parserts asterixdb/asterix-app/library -asterixdb/asterix-app/opt_parserts -asterixdb/asterix-app/runtime_parserts asterixdb/asterix-app/data/csv/beer.csv -asterixdb/asterix-installer/ittest -asterixdb/asterix-installer/repliationtest asterixdb/asterix-installer/src/test/resources/clusterts/asterix-installer-*-SNAPSHOT-binary-assembly *-coredump *.pyc http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java index 3c24cbc..1b528b9 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java @@ -126,4 +126,14 @@ public interface IStatementExecutor { ICompiledDmlStatement dmlStatement) throws AsterixException, RemoteException, AlgebricksException, JSONException, ACIDException; + /** + * returns the active dataverse for an entity or a statement + * + * @param dataverse: + * the entity or statement dataverse + * @return + * returns the passed dataverse if not null, the active dataverse otherwise + */ + String getActiveDataverseName(String dataverse); + } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java index e69f347..2a30713 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java @@ -34,11 +34,11 @@ import org.apache.asterix.lang.common.expression.RecordTypeDefinition.RecordKind import org.apache.asterix.lang.common.expression.TypeExpression; import org.apache.asterix.lang.common.expression.TypeReferenceExpression; import org.apache.asterix.lang.common.expression.UnorderedListTypeDefinition; -import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.entities.AsterixBuiltinTypeMap; import org.apache.asterix.metadata.entities.Datatype; +import org.apache.asterix.metadata.utils.MetadataConstants; import org.apache.asterix.om.types.AOrderedListType; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.om.types.AUnionType; @@ -51,19 +51,23 @@ import org.apache.asterix.om.types.TypeSignature; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; public class TypeTranslator { + private static final Map<String, BuiltinType> builtinTypeMap = AsterixBuiltinTypeMap.getBuiltinTypes(); + + private TypeTranslator() { + } public static Map<TypeSignature, IAType> computeTypes(MetadataTransactionContext mdTxnCtx, TypeExpression typeExpr, - String typeName, String typeDataverse) throws AlgebricksException, MetadataException { - Map<TypeSignature, IAType> typeMap = new HashMap<TypeSignature, IAType>(); + String typeName, String typeDataverse) throws AlgebricksException { + Map<TypeSignature, IAType> typeMap = new HashMap<>(); return computeTypes(mdTxnCtx, typeExpr, typeName, typeDataverse, typeMap); } public static Map<TypeSignature, IAType> computeTypes(MetadataTransactionContext mdTxnCtx, TypeExpression typeExpr, String typeName, String typeDataverse, Map<TypeSignature, IAType> typeMap) - throws AlgebricksException, MetadataException { - Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes = new HashMap<String, Map<ARecordType, List<Integer>>>(); - Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes = new HashMap<TypeSignature, List<AbstractCollectionType>>(); - Map<TypeSignature, List<TypeSignature>> incompleteTopLevelTypeReferences = new HashMap<TypeSignature, List<TypeSignature>>(); + throws AlgebricksException { + Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes = new HashMap<>(); + Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes = new HashMap<>(); + Map<TypeSignature, List<TypeSignature>> incompleteTopLevelTypeReferences = new HashMap<>(); firstPass(typeExpr, typeName, typeMap, incompleteFieldTypes, incompleteItemTypes, incompleteTopLevelTypeReferences, typeDataverse); secondPass(mdTxnCtx, typeMap, incompleteFieldTypes, incompleteItemTypes, incompleteTopLevelTypeReferences, @@ -77,8 +81,6 @@ public class TypeTranslator { return typeMap; } - private static Map<String, BuiltinType> builtinTypeMap = AsterixBuiltinTypeMap.getBuiltinTypes(); - private static void firstPass(TypeExpression typeExpr, String typeName, Map<TypeSignature, IAType> typeMap, Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes, Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes, @@ -93,11 +95,13 @@ public class TypeTranslator { switch (typeExpr.getTypeKind()) { case TYPEREFERENCE: { TypeReferenceExpression tre = (TypeReferenceExpression) typeExpr; - IAType t = solveTypeReference(new TypeSignature(typeDataverse, tre.getIdent().getValue()), typeMap); + IAType t = solveTypeReference(new TypeSignature( + tre.getIdent().first == null ? typeDataverse : tre.getIdent().first.getValue(), + tre.getIdent().second.getValue()), typeMap); if (t != null) { typeMap.put(typeSignature, t); } else { - addIncompleteTopLevelTypeReference(typeName, tre, incompleteTopLevelTypeReferences, + addIncompleteTopLevelTypeReference(tre, incompleteTopLevelTypeReferences, typeDataverse); } break; @@ -136,11 +140,10 @@ public class TypeTranslator { Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes, Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes, Map<TypeSignature, List<TypeSignature>> incompleteTopLevelTypeReferences, String typeDataverse) - throws AlgebricksException, MetadataException { + throws AlgebricksException { // solve remaining top level references - for (TypeSignature typeSignature : incompleteTopLevelTypeReferences.keySet()) { - IAType t;// = typeMap.get(trefName); + IAType t; Datatype dt = MetadataManager.INSTANCE.getDatatype(mdTxnCtx, typeSignature.getNamespace(), typeSignature.getName()); if (dt == null) { @@ -154,9 +157,13 @@ public class TypeTranslator { } // solve remaining field type references for (String trefName : incompleteFieldTypes.keySet()) { - IAType t;// = typeMap.get(trefName); + IAType t; Datatype dt = MetadataManager.INSTANCE.getDatatype(mdTxnCtx, typeDataverse, trefName); if (dt == null) { + dt = MetadataManager.INSTANCE.getDatatype(mdTxnCtx, MetadataConstants.METADATA_DATAVERSE_NAME, + trefName); + } + if (dt == null) { throw new AlgebricksException("Could not resolve type " + trefName); } else { t = dt.getDatatype(); @@ -178,8 +185,8 @@ public class TypeTranslator { // solve remaining item type references for (TypeSignature typeSignature : incompleteItemTypes.keySet()) { - IAType t;// = typeMap.get(trefName); - Datatype dt = null; + IAType t; + Datatype dt; if (MetadataManager.INSTANCE != null) { dt = MetadataManager.INSTANCE.getDatatype(mdTxnCtx, typeSignature.getNamespace(), typeSignature.getName()); @@ -247,7 +254,9 @@ public class TypeTranslator { } case TYPEREFERENCE: { TypeReferenceExpression tre = (TypeReferenceExpression) tExpr; - TypeSignature signature = new TypeSignature(defaultDataverse, tre.getIdent().getValue()); + TypeSignature signature = new TypeSignature( + tre.getIdent().first == null ? defaultDataverse : tre.getIdent().first.getValue(), + tre.getIdent().second.getValue()); IAType tref = solveTypeReference(signature, typeMap); if (tref != null) { act.setItemType(tref); @@ -265,11 +274,12 @@ public class TypeTranslator { private static void addIncompleteCollectionTypeReference(AbstractCollectionType collType, TypeReferenceExpression tre, Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes, String defaultDataverse) { - String typeName = tre.getIdent().getValue(); - TypeSignature typeSignature = new TypeSignature(defaultDataverse, typeName); + String typeName = tre.getIdent().second.getValue(); + TypeSignature typeSignature = new TypeSignature( + tre.getIdent().first == null ? defaultDataverse : tre.getIdent().first.getValue(), typeName); List<AbstractCollectionType> typeList = incompleteItemTypes.get(typeSignature); if (typeList == null) { - typeList = new LinkedList<AbstractCollectionType>(); + typeList = new LinkedList<>(); incompleteItemTypes.put(typeSignature, typeList); } typeList.add(collType); @@ -277,28 +287,31 @@ public class TypeTranslator { private static void addIncompleteFieldTypeReference(ARecordType recType, int fldPosition, TypeReferenceExpression tre, Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes) { - String typeName = tre.getIdent().getValue(); + String typeName = tre.getIdent().second.getValue(); Map<ARecordType, List<Integer>> refMap = incompleteFieldTypes.get(typeName); if (refMap == null) { - refMap = new HashMap<ARecordType, List<Integer>>(); + refMap = new HashMap<>(); incompleteFieldTypes.put(typeName, refMap); } List<Integer> typeList = refMap.get(recType); if (typeList == null) { - typeList = new ArrayList<Integer>(); + typeList = new ArrayList<>(); refMap.put(recType, typeList); } typeList.add(fldPosition); } - private static void addIncompleteTopLevelTypeReference(String tdeclName, TypeReferenceExpression tre, + private static void addIncompleteTopLevelTypeReference(TypeReferenceExpression tre, Map<TypeSignature, List<TypeSignature>> incompleteTopLevelTypeReferences, String defaultDataverse) { - String name = tre.getIdent().getValue(); - TypeSignature typeSignature = new TypeSignature(defaultDataverse, name); + String name = tre.getIdent().second.getValue(); + TypeSignature typeSignature = new TypeSignature( + tre.getIdent().first == null ? defaultDataverse : tre.getIdent().first.getValue(), name); List<TypeSignature> refList = incompleteTopLevelTypeReferences.get(name); if (refList == null) { - refList = new LinkedList<TypeSignature>(); - incompleteTopLevelTypeReferences.put(new TypeSignature(defaultDataverse, tre.getIdent().getValue()), + refList = new LinkedList<>(); + incompleteTopLevelTypeReferences.put( + new TypeSignature(tre.getIdent().first == null ? defaultDataverse : tre.getIdent().first.getValue(), + tre.getIdent().second.getValue()), refList); } refList.add(typeSignature); @@ -340,7 +353,9 @@ public class TypeTranslator { switch (texpr.getTypeKind()) { case TYPEREFERENCE: { TypeReferenceExpression tre = (TypeReferenceExpression) texpr; - TypeSignature signature = new TypeSignature(defaultDataverse, tre.getIdent().getValue()); + TypeSignature signature = new TypeSignature( + tre.getIdent().first == null ? defaultDataverse : tre.getIdent().first.getValue(), + tre.getIdent().second.getValue()); IAType tref = solveTypeReference(signature, typeMap); if (tref != null) { if (!rtd.getOptionableFields().get(j)) { // not nullable http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj b/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj index 725f50a..2c991cb 100644 --- a/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj +++ b/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj @@ -100,6 +100,7 @@ import org.apache.asterix.lang.common.struct.Identifier; import org.apache.asterix.lang.common.struct.QuantifiedPair; import org.apache.asterix.lang.common.struct.VarIdentifier; import org.apache.asterix.metadata.utils.MetadataConstants; +import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation; @@ -407,7 +408,7 @@ TypeReferenceExpression TypeReference() throws ParseException: } else { id = new Identifier(t.toString()); } - return new TypeReferenceExpression(id); + return new TypeReferenceExpression(new Pair<Identifier,Identifier>(null,id)); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index 27f7ca6..d5811c4 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@ -133,6 +133,7 @@ import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.api.IMetadataEntity; +import org.apache.asterix.metadata.bootstrap.MetadataBuiltinEntities; import org.apache.asterix.metadata.dataset.hints.DatasetHints; import org.apache.asterix.metadata.dataset.hints.DatasetHints.DatasetNodegroupCardinalityHint; import org.apache.asterix.metadata.declared.AqlMetadataProvider; @@ -235,6 +236,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen this.declaredFunctions = getDeclaredFunctions(aqlStatements); this.apiFramework = new APIFramework(compliationProvider, ccExtensionManager); this.rewriterFactory = compliationProvider.getRewriterFactory(); + activeDefaultDataverse = MetadataBuiltinEntities.DEFAULT_DATAVERSE; } protected List<FunctionDecl> getDeclaredFunctions(List<Statement> statements) { @@ -1146,7 +1148,6 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen metadataProvider.setMetadataTxnContext(mdTxnCtx); MetadataLockManager.INSTANCE.createTypeBegin(dataverseName, dataverseName + "." + typeName); try { - Dataverse dv = MetadataManager.INSTANCE.getDataverse(mdTxnCtx, dataverseName); if (dv == null) { throw new AlgebricksException("Unknown dataverse " + dataverseName); @@ -1180,6 +1181,10 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen IHyracksClientConnection hcc) throws Exception { DataverseDropStatement stmtDelete = (DataverseDropStatement) stmt; String dataverseName = stmtDelete.getDataverseName().getValue(); + if (dataverseName.equals(MetadataBuiltinEntities.DEFAULT_DATAVERSE_NAME)) { + throw new HyracksDataException( + MetadataBuiltinEntities.DEFAULT_DATAVERSE_NAME + " dataverse can't be dropped"); + } ProgressState progress = ProgressState.NO_PROGRESS; MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); @@ -3088,14 +3093,9 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen return cmds; } - protected String getActiveDataverseName(String dataverse) throws AlgebricksException { - if (dataverse != null) { - return dataverse; - } - if (activeDefaultDataverse != null) { - return activeDefaultDataverse.getDataverseName(); - } - throw new AlgebricksException("dataverse not specified"); + @Override + public String getActiveDataverseName(String dataverse) { + return (dataverse != null) ? dataverse : activeDefaultDataverse.getDataverseName(); } protected String getActiveDataverse(Identifier dataverse) throws AlgebricksException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java index 0a12bf2..c678bf3 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java @@ -44,7 +44,6 @@ import org.apache.asterix.event.schema.cluster.Cluster; import org.apache.asterix.event.schema.cluster.Node; import org.apache.asterix.messaging.MessagingChannelInterfaceFactory; import org.apache.asterix.messaging.NCMessageBroker; -import org.apache.asterix.metadata.bootstrap.MetadataBootstrap; import org.apache.asterix.runtime.message.ReportMaxResourceIdMessage; import org.apache.asterix.transaction.management.resource.PersistentLocalResourceRepository; import org.apache.asterix.transaction.management.service.recovery.RecoveryManager; @@ -190,11 +189,6 @@ public class NCApplicationEntryPoint implements INCApplicationEntryPoint { if (LOGGER.isLoggable(Level.INFO)) { LOGGER.info("Stopping Asterix node controller: " + nodeId); } - - if (isMetadataNode) { - MetadataBootstrap.stopUniverse(); - } - //Clean any temporary files performLocalCleanUp(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java index cbe6e85..6392410 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java @@ -42,7 +42,7 @@ public class MetadataTest { private TestCaseContext tcCtx; - private static final String PATH_ACTUAL = "mdtest" + File.separator; + private static final String PATH_ACTUAL = "target" + File.separator + "mdtest" + File.separator; private static final String PATH_BASE = StringUtils .join(new String[] { "src", "test", "resources", "metadata" + File.separator }, File.separator); private static final String TEST_CONFIG_FILE_NAME = "asterix-build-configuration.xml"; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java index 1f64868..6e3f94c 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java @@ -66,7 +66,7 @@ public class OptimizerTest { + "optimizerts" + SEPARATOR; private static final String PATH_QUERIES = PATH_BASE + "queries" + SEPARATOR; private static final String PATH_EXPECTED = PATH_BASE + "results" + SEPARATOR; - private static final String PATH_ACTUAL = "opttest" + SEPARATOR; + private static final String PATH_ACTUAL = "target" + File.separator + "opttest" + SEPARATOR; private static final ArrayList<String> ignore = AsterixTestHelper.readFile(FILENAME_IGNORE, PATH_BASE); private static final ArrayList<String> only = AsterixTestHelper.readFile(FILENAME_ONLY, PATH_BASE); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTest.java index adc691f..15bb500 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTest.java @@ -45,11 +45,12 @@ public class ExecutionTest { protected static final Logger LOGGER = Logger.getLogger(ExecutionTest.class.getName()); - protected static final String PATH_ACTUAL = "rttest" + File.separator; + protected static final String PATH_ACTUAL = "target" + File.separator + "rttest" + File.separator; protected static final String PATH_BASE = StringUtils.join(new String[] { "src", "test", "resources", "runtimets" }, File.separator); protected static final String TEST_CONFIG_FILE_NAME = "asterix-build-configuration.xml"; + protected static final List<String> badTestCases = new ArrayList<>(); protected static AsterixTransactionProperties txnProperties; protected static final TestExecutor testExecutor = new TestExecutor(); private static final boolean cleanupOnStart = true; @@ -81,6 +82,12 @@ public class ExecutionTest { // remove library directory TestLibrarian.removeLibraryDir(); ExecutionTestUtil.tearDown(cleanupOnStop); + if (!badTestCases.isEmpty()) { + System.out.println("The following test cases left some data"); + for (String testCase : badTestCases) { + System.out.println(testCase); + } + } } @Parameters(name = "ExecutionTest {index}: {0}") @@ -117,6 +124,12 @@ public class ExecutionTest { } librarian.cleanup(); testExecutor.executeTest(PATH_ACTUAL, tcCtx, null, false, ExecutionTestUtil.FailedGroup); + try { + testExecutor.cleanup(tcCtx.toString(), badTestCases); + } catch (Throwable th) { + th.printStackTrace(); + throw th; + } } } finally { System.err.flush(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java index 84e644b..520e00f 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java @@ -21,9 +21,9 @@ package org.apache.asterix.test.runtime; import java.io.File; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.logging.Logger; -import org.apache.asterix.api.common.AsterixHyracksIntegrationUtil; import org.apache.asterix.common.config.AsterixTransactionProperties; import org.apache.asterix.test.aql.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; @@ -44,13 +44,14 @@ public class SqlppExecutionTest { protected static final Logger LOGGER = Logger.getLogger(SqlppExecutionTest.class.getName()); - protected static final String PATH_ACTUAL = "rttest" + File.separator; + protected static final String PATH_ACTUAL = "target" + File.separator + "rttest" + File.separator; protected static final String PATH_BASE = StringUtils.join(new String[] { "src", "test", "resources", "runtimets" }, File.separator); protected static final String TEST_CONFIG_FILE_NAME = "asterix-build-configuration.xml"; protected static AsterixTransactionProperties txnProperties; + protected static final List<String> badTestCases = new ArrayList<>(); private static final TestExecutor testExecutor = new TestExecutor(); private static final boolean cleanupOnStart = true; private static final boolean cleanupOnStop = true; @@ -68,6 +69,12 @@ public class SqlppExecutionTest { public static void tearDown() throws Exception { ExecutionTestUtil.tearDown(cleanupOnStop); ExecutionTestUtil.integrationUtil.removeTestStorageFiles(); + if (!badTestCases.isEmpty()) { + System.out.println("The following test cases left some data"); + for (String testCase : badTestCases) { + System.out.println(testCase); + } + } } @Parameters(name = "SqlppExecutionTest {index}: {0}") @@ -97,5 +104,6 @@ public class SqlppExecutionTest { @Test public void test() throws Exception { testExecutor.executeTest(PATH_ACTUAL, tcCtx, null, false, FailedGroup); + testExecutor.cleanup(tcCtx.toString(), badTestCases); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java index 485d658..ef17c9f 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java @@ -48,7 +48,8 @@ public class OptimizerParserTest { + "optimizerts" + SEPARATOR; private static final String PATH_QUERIES = PATH_BASE + "queries_sqlpp" + SEPARATOR; private static final String PATH_EXPECTED = PATH_BASE + "results_parser_sqlpp" + SEPARATOR; - private static final String PATH_ACTUAL = "opt_parserts" + SEPARATOR; + private static final String PATH_ACTUAL = + "target" + File.separator + "opt_parserts" + SEPARATOR + "results_parser_sqlpp" + SEPARATOR; private static final ArrayList<String> ignore = AsterixTestHelper.readFile(FILENAME_IGNORE, PATH_BASE); private static final ArrayList<String> only = AsterixTestHelper.readFile(FILENAME_ONLY, PATH_BASE); @@ -75,7 +76,7 @@ public class OptimizerParserTest { if (file.isFile() && file.getName().endsWith(EXTENSION_QUERY)) { String resultFileName = AsterixTestHelper.extToResExt(file.getName(), EXTENSION_RESULT); File expectedFile = new File(PATH_EXPECTED + path + resultFileName); - File actualFile = new File(PATH_ACTUAL + SEPARATOR + path.replace(SEPARATOR, "_") + resultFileName); + File actualFile = new File(PATH_ACTUAL + path + resultFileName); testArgs.add(new Object[] { file, expectedFile, actualFile }); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java index 05a7dce..79e0959 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java @@ -48,6 +48,7 @@ import org.apache.asterix.lang.sqlpp.util.SqlppRewriteUtil; import org.apache.asterix.metadata.declared.AqlMetadataProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.base.ComparisonException; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.asterix.testframework.context.TestFileContext; import org.apache.asterix.testframework.xml.TestCase.CompilationUnit; @@ -74,8 +75,9 @@ public class ParserTestExecutor extends TestExecutor { for (TestFileContext ctx : testFileCtxs) { File testFile = ctx.getFile(); try { - if (queryCount >= expectedResultFileCtxs.size()) { - throw new IllegalStateException("no result file for " + testFile.toString() + "; queryCount: " + if (queryCount >= expectedResultFileCtxs.size() + && !cUnit.getOutputDir().getValue().equals("none")) { + throw new ComparisonException("no result file for " + testFile.toString() + "; queryCount: " + queryCount + ", filectxs.size: " + expectedResultFileCtxs.size()); } @@ -98,6 +100,10 @@ public class ParserTestExecutor extends TestExecutor { } throw new Exception("Test \"" + testFile + "\" FAILED!", e); } else { + // must compare with the expected failure message + if (e instanceof ComparisonException) { + throw e; + } LOGGER.info("[TEST]: " + testCaseCtx.getTestCase().getFilePath() + "/" + cUnit.getName() + " failed as expected: " + e.getMessage()); System.err.println("...but that was expected."); @@ -105,7 +111,6 @@ public class ParserTestExecutor extends TestExecutor { } } } - } // Tests the SQL++ parser. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java index d9d03f9..99fde7d 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java @@ -42,7 +42,7 @@ public class RuntimeParserTest { protected static final Logger LOGGER = Logger.getLogger(RuntimeParserTest.class.getName()); - protected static final String PATH_ACTUAL = "runtime_parserts" + File.separator; + protected static final String PATH_ACTUAL = "target" + File.separator + "runtime_parserts" + File.separator; protected static final String PATH_BASE = StringUtils.join(new String[] { "src", "test", "resources", "runtimets" }, File.separator); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java index 04213a8..dd727c3 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java @@ -48,7 +48,7 @@ public class SmokeParserTest { + "parserts" + SEPARATOR; private static final String PATH_QUERIES = PATH_BASE + "queries_sqlpp" + SEPARATOR; private static final String PATH_EXPECTED = PATH_BASE + "results_parser_sqlpp" + SEPARATOR; - private static final String PATH_ACTUAL = "parserts" + SEPARATOR; + private static final String PATH_ACTUAL = "target" + File.separator + "parserts" + SEPARATOR; private static final ArrayList<String> ignore = AsterixTestHelper.readFile(FILENAME_IGNORE, PATH_BASE); private static final ArrayList<String> only = AsterixTestHelper.readFile(FILENAME_ONLY, PATH_BASE); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/metadata/results/basic/meta01/meta01.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/meta01/meta01.1.adm b/asterixdb/asterix-app/src/test/resources/metadata/results/basic/meta01/meta01.1.adm index e341727..313cefe 100644 --- a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/meta01/meta01.1.adm +++ b/asterixdb/asterix-app/src/test/resources/metadata/results/basic/meta01/meta01.1.adm @@ -1,2 +1,3 @@ +{ "DataverseName": "Default", "DataFormat": "org.apache.asterix.runtime.formats.NonTaggedDataFormat", "Timestamp": "Wed Sep 14 23:26:12 EEST 2016", "PendingOp": 0 } { "DataverseName": "Metadata", "DataFormat": "org.apache.asterix.runtime.formats.NonTaggedDataFormat", "Timestamp": "Tue Jun 21 15:54:20 PDT 2016", "PendingOp": 0 } { "DataverseName": "testdv", "DataFormat": "org.apache.asterix.runtime.formats.NonTaggedDataFormat", "Timestamp": "Tue Jun 21 15:54:27 PDT 2016", "PendingOp": 0 } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_datatype/metadata_datatype.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_datatype/metadata_datatype.1.adm b/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_datatype/metadata_datatype.1.adm index 1920bab..91639a8 100644 --- a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_datatype/metadata_datatype.1.adm +++ b/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_datatype/metadata_datatype.1.adm @@ -1,3 +1,4 @@ +{ "DataverseName": "Metadata", "DatatypeName": "AnyObject", "Derived": { "Tag": "RECORD", "IsAnonymous": false, "Record": { "IsOpen": true, "Fields": [ ] } }, "Timestamp": "Wed Sep 14 23:26:12 EEST 2016" } { "DataverseName": "Metadata", "DatatypeName": "CompactionPolicyRecordType", "Derived": { "Tag": "RECORD", "IsAnonymous": false, "Record": { "IsOpen": true, "Fields": [ { "FieldName": "DataverseName", "FieldType": "string", "IsNullable": false }, { "FieldName": "CompactionPolicy", "FieldType": "string", "IsNullable": false }, { "FieldName": "Classname", "FieldType": "string", "IsNullable": false } ] } }, "Timestamp": "Wed Jul 27 00:27:47 AST 2016" } { "DataverseName": "Metadata", "DatatypeName": "DatasetRecordType", "Derived": { "Tag": "RECORD", "IsAnonymous": false, "Record": { "IsOpen": true, "Fields": [ { "FieldName": "DataverseName", "FieldType": "string", "IsNullable": false }, { "FieldName": "DatasetName", "FieldType": "string", "IsNullable": false }, { "FieldName": "DatatypeDataverseName", "FieldType": "string", "IsNullable": false }, { "FieldName": "DatatypeName", "FieldType": "string", "IsNullable": false }, { "FieldName": "DatasetType", "FieldType": "string", "IsNullable": false }, { "FieldName": "GroupName", "FieldType": "string", "IsNullable": false }, { "FieldName": "CompactionPolicy", "FieldType": "string", "IsNullable": false }, { "FieldName": "CompactionPolicyProperties", "FieldType": "DatasetRecordType_CompactionPolicyProperties", "IsNullable": false }, { "FieldName": "InternalDetails", "FieldType": "DatasetRecordType_InternalDetails", "IsNullable": true }, { "FieldName": "ExternalDetails", "FieldType": "Datase tRecordType_ExternalDetails", "IsNullable": true }, { "FieldName": "Hints", "FieldType": "DatasetRecordType_Hints", "IsNullable": false }, { "FieldName": "Timestamp", "FieldType": "string", "IsNullable": false }, { "FieldName": "DatasetId", "FieldType": "int32", "IsNullable": false }, { "FieldName": "PendingOp", "FieldType": "int32", "IsNullable": false } ] } }, "Timestamp": "Wed Jul 27 00:27:47 AST 2016" } { "DataverseName": "Metadata", "DatatypeName": "DatasetRecordType_CompactionPolicyProperties", "Derived": { "Tag": "ORDEREDLIST", "IsAnonymous": true, "OrderedList": "DatasetRecordType_CompactionPolicyProperties_Item" }, "Timestamp": "Wed Jul 27 00:27:47 AST 2016" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_dataverse/metadata_dataverse.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_dataverse/metadata_dataverse.1.adm b/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_dataverse/metadata_dataverse.1.adm index b301d59..519c800 100644 --- a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_dataverse/metadata_dataverse.1.adm +++ b/asterixdb/asterix-app/src/test/resources/metadata/results/basic/metadata_dataverse/metadata_dataverse.1.adm @@ -1,3 +1,4 @@ +{ "DataverseName": "Default", "DataFormat": "org.apache.asterix.runtime.formats.NonTaggedDataFormat", "Timestamp": "Wed Sep 14 23:26:12 EEST 2016", "PendingOp": 0 } { "DataverseName": "Metadata", "DataFormat": "org.apache.asterix.runtime.formats.NonTaggedDataFormat", "Timestamp": "Tue Jun 21 15:54:20 PDT 2016", "PendingOp": 0 } { "DataverseName": "test", "DataFormat": "org.apache.asterix.runtime.formats.NonTaggedDataFormat", "Timestamp": "Tue Jun 21 15:54:27 PDT 2016", "PendingOp": 0 } { "DataverseName": "testdv", "DataFormat": "org.apache.asterix.runtime.formats.NonTaggedDataFormat", "Timestamp": "Tue Jun 21 15:54:28 PDT 2016", "PendingOp": 0 } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop-dataverse/drop-dataverse.3.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop-dataverse/drop-dataverse.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop-dataverse/drop-dataverse.3.ddl.aql new file mode 100644 index 0000000..fe3f670 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop-dataverse/drop-dataverse.3.ddl.aql @@ -0,0 +1,27 @@ +/* + * 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. + */ +/* + * Description : Test cross dataverse functionality + * : create a dataset using a foreign datatype + * : Try dropping the foreign type's dataverse + * Expected Res : Failure + * Date : 2015 Steven Jacobs + */ +drop dataverse b; +drop dataverse a; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop-type-used-elsewhere/drop-type-used-elsewhere.3.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop-type-used-elsewhere/drop-type-used-elsewhere.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop-type-used-elsewhere/drop-type-used-elsewhere.3.ddl.aql new file mode 100644 index 0000000..20aad07 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop-type-used-elsewhere/drop-type-used-elsewhere.3.ddl.aql @@ -0,0 +1,29 @@ +/* + * 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. + */ +/* + * Description : Test cross dataverse functionality + * : create a dataset using a foreign datatype + * : Try dropping the foreign datatype + * Expected Res : Failure + * Date : 2015 Steven Jacobs + */ + + +drop dataverse b; +drop dataverse a; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/query-dataset-with-foreign-type/query-dataset-with-foreign-type.4.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/query-dataset-with-foreign-type/query-dataset-with-foreign-type.4.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/query-dataset-with-foreign-type/query-dataset-with-foreign-type.4.ddl.aql new file mode 100644 index 0000000..aa8ebab --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/query-dataset-with-foreign-type/query-dataset-with-foreign-type.4.ddl.aql @@ -0,0 +1,27 @@ +/* + * 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. + */ +/* + * Description : Test cross dataverse functionality + * : create a dataset using a foreign datatype + * : Query the dataset + * Expected Res : Success + * Date : 2015 Steven Jacobs + */ +drop dataverse b; +drop dataverse a; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index-open_02/load-with-index-open_02.4.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index-open_02/load-with-index-open_02.4.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index-open_02/load-with-index-open_02.4.ddl.aql new file mode 100644 index 0000000..c445af0 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index-open_02/load-with-index-open_02.4.ddl.aql @@ -0,0 +1,20 @@ +/* + * 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 OpenTinySocial; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/query-issue382/query-issue382.4.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/query-issue382/query-issue382.4.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/query-issue382/query-issue382.4.ddl.aql new file mode 100644 index 0000000..8d80593 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/query-issue382/query-issue382.4.ddl.aql @@ -0,0 +1,19 @@ +/* + * 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 SocialNetworkData; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes-err-1/escapes-err-1.3.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes-err-1/escapes-err-1.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes-err-1/escapes-err-1.3.ddl.aql new file mode 100644 index 0000000..11db2eb --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes-err-1/escapes-err-1.3.ddl.aql @@ -0,0 +1,19 @@ +/* + * 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 TestDataverse; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes01/escapes01.4.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes01/escapes01.4.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes01/escapes01.4.ddl.aql new file mode 100644 index 0000000..11db2eb --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes01/escapes01.4.ddl.aql @@ -0,0 +1,19 @@ +/* + * 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 TestDataverse; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes02/escapes02.4.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes02/escapes02.4.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes02/escapes02.4.ddl.aql new file mode 100644 index 0000000..11db2eb --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/escapes02/escapes02.4.ddl.aql @@ -0,0 +1,19 @@ +/* + * 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 TestDataverse; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/load_non-empty_index/load_non-empty_index.3.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/load_non-empty_index/load_non-empty_index.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/load_non-empty_index/load_non-empty_index.3.ddl.aql new file mode 100644 index 0000000..dbc8d52 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/load_non-empty_index/load_non-empty_index.3.ddl.aql @@ -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. + */ +/* + * Description : Bulkload non-empty index. + * Expected Res : Failure + * Date : 29 July 2016 + */ +drop dataverse OpenTinySocial; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/type_promotion_0/type_promotion_0.4.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/type_promotion_0/type_promotion_0.4.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/type_promotion_0/type_promotion_0.4.ddl.aql new file mode 100644 index 0000000..11db2eb --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/load/type_promotion_0/type_promotion_0.4.ddl.aql @@ -0,0 +1,19 @@ +/* + * 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 TestDataverse; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/misc/flushtest/flushtest.5.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/misc/flushtest/flushtest.5.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/misc/flushtest/flushtest.5.ddl.aql new file mode 100644 index 0000000..7538fa3 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/misc/flushtest/flushtest.5.ddl.aql @@ -0,0 +1,19 @@ +/* + * 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 DMLTest; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208/query-issue208.4.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208/query-issue208.4.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208/query-issue208.4.ddl.aql new file mode 100644 index 0000000..0ac8674 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue208/query-issue208.4.ddl.aql @@ -0,0 +1,26 @@ +/* + * 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. + */ +/* + * Description : This test case is to verify the fix for issue208 + : https://code.google.com/p/asterixdb/issues/detail?id=208 + * Expected Res : Success + * Date : 26th November 2012 + */ + +drop dataverse OpenSocialNetworkData; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236/query-issue236.4.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236/query-issue236.4.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236/query-issue236.4.ddl.aql new file mode 100644 index 0000000..eb4023d --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-closed/query-issue236/query-issue236.4.ddl.aql @@ -0,0 +1,26 @@ +/* + * 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. + */ +/* + * Description : This test case is to verify the fix for issue236 + : https://code.google.com/p/asterixdb/issues/detail?id=236 + * Expected Res : Success + * Date : 20 Dec. 2012 + */ + +drop dataverse SocialNetworkData; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/types/any-object/any-object.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/types/any-object/any-object.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/types/any-object/any-object.1.ddl.aql new file mode 100644 index 0000000..1a70aaa --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/types/any-object/any-object.1.ddl.aql @@ -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. + */ + +drop dataverse test if exists; +create dataverse test; +use dataverse test; + +create type kv1 as { id: int32, val: AnyObject }; +create type kv2 as { id: int32, val: Metadata.AnyObject }; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/types/any-object/any-object.2.query.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/types/any-object/any-object.2.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/types/any-object/any-object.2.query.aql new file mode 100644 index 0000000..e7208ca --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/types/any-object/any-object.2.query.aql @@ -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. + */ + +for $x in dataset Metadata.Datatype +return $x; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries/upsert/issue1587-foreignDataType/issue1587-foreignDataType.4.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/upsert/issue1587-foreignDataType/issue1587-foreignDataType.4.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/upsert/issue1587-foreignDataType/issue1587-foreignDataType.4.ddl.aql new file mode 100644 index 0000000..71eaed1 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/upsert/issue1587-foreignDataType/issue1587-foreignDataType.4.ddl.aql @@ -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. + */ +/* + * Description : Upsert into a dataset which has a foreign datatype + * Expected Res : Success + * Date : Aug 18th 2016 + */ +drop dataverse b; +drop dataverse a; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.5.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.5.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.5.ddl.sqlpp new file mode 100644 index 0000000..399a7f2 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.5.ddl.sqlpp @@ -0,0 +1,20 @@ +/* + * 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 DMLTest; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_02/order-by-exception_02.4.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_02/order-by-exception_02.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_02/order-by-exception_02.4.query.sqlpp index f953098..2faaecf 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_02/order-by-exception_02.4.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_02/order-by-exception_02.4.query.sqlpp @@ -22,5 +22,4 @@ use TinySocial; select element user from TwitterUsers as user -order by user.`screen-name` desc -; +order by user.`screen-name`; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.1.ddl.sqlpp new file mode 100644 index 0000000..e72b803 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.1.ddl.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. + */ + +drop dataverse test if exists; +create dataverse test; +use test; + +create type kv1 as { id: int32, val: AnyObject }; +create type kv2 as { id: int32, val: Metadata.AnyObject }; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e4b318f6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.2.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.2.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.2.query.sqlpp new file mode 100644 index 0000000..04beba1 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.2.query.sqlpp @@ -0,0 +1,20 @@ +/* + * 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. + */ + +select element x from Metadata.Datatype as x; \ No newline at end of file
