>From Hussain Towaileb <[email protected]>: Hussain Towaileb has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17735 )
Change subject: [ASTERIXDB-3244][EXT]: Add dynamic prefixes tests ...................................................................... [ASTERIXDB-3244][EXT]: Add dynamic prefixes tests Change-Id: I78ac712e97ad8371448fbd42b1ea1b737fe743d7 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17735 Integration-Tests: Jenkins <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Reviewed-by: Wail Alkowaileet <[email protected]> Tested-by: Jenkins <[email protected]> --- R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.110.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.131.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.010.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.111.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.020.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.000.ddl.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.000.ddl.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.011.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.130.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.111.plan R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.010.adm R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.011.plan R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.011.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.010.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.022.adm R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.021.adm R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.021.plan R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.130.adm R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/type-mismatch/result.010.adm R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.020.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.999.ddl.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.016.adm R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.040.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.120.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.999.ddl.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.121.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.019.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.031.plan R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.131.plan R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.017.adm R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.120.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.013.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.015.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.014.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.015.query.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_azure_blob_storage.xml R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.030.adm R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.018.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.021.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.016.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.018.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.023.adm R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.110.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.010.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.014.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.017.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.030.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.041.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.019.adm M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.031.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.020.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.041.plan R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.040.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.000.ddl.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.013.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.023.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.012.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.021.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.022.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.011.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.012.adm R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.010.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.121.plan R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.020.query.sqlpp 65 files changed, 56 insertions(+), 33 deletions(-) Approvals: Wail Alkowaileet: Looks good to me, approved Hussain Towaileb: Looks good to me, but someone else must approve Jenkins: Verified; Verified Objections: Anon. E. Moose #1000171: Violations found diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.000.ddl.sqlpp similarity index 73% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.000.ddl.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.000.ddl.sqlpp index 158cea1..27885d2 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.000.ddl.sqlpp @@ -25,21 +25,15 @@ }; -CREATE EXTERNAL DATASET Department(TestType) USING S3 ( - ("accessKeyId"="dummyAccessKey"), - ("secretAccessKey"="dummySecretKey"), - ("region"="us-west-2"), - ("serviceEndpoint"="http://127.0.0.1:8001";), +CREATE EXTERNAL DATASET Department(TestType) USING %adapter% ( + %template%, ("container"="playground"), ("definition"="external-filter/department/{department:string}"), ("format"="json") ); -CREATE EXTERNAL DATASET LastName(TestType) USING S3 ( - ("accessKeyId"="dummyAccessKey"), - ("secretAccessKey"="dummySecretKey"), - ("region"="us-west-2"), - ("serviceEndpoint"="http://127.0.0.1:8001";), +CREATE EXTERNAL DATASET LastName(TestType) USING %adapter% ( + %template%, ("container"="playground"), ("container"="playground"), ("definition"="external-filter/last-name/{name.last:string}"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.010.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.010.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.010.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.010.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.011.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.011.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.011.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.011.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.020.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.020.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.020.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.020.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.021.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.021.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.021.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.021.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.030.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.030.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.030.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.030.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.031.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.031.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.031.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.031.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.040.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.040.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.040.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.040.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.041.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.041.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.041.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.041.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.110.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.110.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.110.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.110.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.111.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.111.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.111.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.111.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.120.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.120.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.120.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.120.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.121.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.121.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.121.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.121.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.130.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.130.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.130.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.130.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.131.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.131.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/one-field/one-field.131.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/one-field/one-field.131.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.000.ddl.sqlpp similarity index 68% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.000.ddl.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.000.ddl.sqlpp index e8d2a68..4fdae03 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.000.ddl.sqlpp @@ -25,31 +25,22 @@ }; -CREATE EXTERNAL DATASET company(test) USING S3 ( - ("accessKeyId"="dummyAccessKey"), - ("secretAccessKey"="dummySecretKey"), - ("region"="us-west-2"), - ("serviceEndpoint"="http://127.0.0.1:8001";), +CREATE EXTERNAL DATASET company(test) USING %adapter% ( + %template%, ("container"="playground"), ("definition"="external-filter/car/{company:string}"), ("format"="json") ); -CREATE EXTERNAL DATASET customer(test) USING S3 ( - ("accessKeyId"="dummyAccessKey"), - ("secretAccessKey"="dummySecretKey"), - ("region"="us-west-2"), - ("serviceEndpoint"="http://127.0.0.1:8001";), +CREATE EXTERNAL DATASET customer(test) USING %adapter% ( + %template%, ("container"="playground"), ("definition"="external-filter/car/{company:string}/customer/{customer_id:int}"), ("format"="json") ); -CREATE EXTERNAL DATASET maintenance(test) USING S3 ( - ("accessKeyId"="dummyAccessKey"), - ("secretAccessKey"="dummySecretKey"), - ("region"="us-west-2"), - ("serviceEndpoint"="http://127.0.0.1:8001";), +CREATE EXTERNAL DATASET maintenance(test) USING %adapter% ( + %template%, ("container"="playground"), ("definition"="external-filter/car/{company:string}/customer/{customer_id:int}/maintenance-report/year-{year:int}-month-{month:int}-day-{day:int}-date"), ("format"="json") diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.010.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.010.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.010.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.010.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.011.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.011.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.011.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.011.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.012.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.012.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.012.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.012.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.013.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.013.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.013.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.013.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.014.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.014.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.014.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.014.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.015.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.015.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.015.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.015.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.016.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.016.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.016.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.016.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.017.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.017.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.017.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.017.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.018.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.018.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.018.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.018.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.019.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.019.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.019.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.019.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.020.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.020.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.020.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.020.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.021.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.021.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.021.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.021.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.022.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.022.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.022.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.022.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.023.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.023.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.023.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.023.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.999.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.999.ddl.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.999.ddl.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/query/test.999.ddl.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.000.ddl.sqlpp similarity index 83% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.000.ddl.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.000.ddl.sqlpp index c1caa4f..ee22f55 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.000.ddl.sqlpp @@ -25,11 +25,8 @@ }; -CREATE EXTERNAL DATASET test(test) USING S3 ( - ("accessKeyId"="dummyAccessKey"), - ("secretAccessKey"="dummySecretKey"), - ("region"="us-west-2"), - ("serviceEndpoint"="http://127.0.0.1:8001";), +CREATE EXTERNAL DATASET test(test) USING %adapter% ( + %template%, ("container"="playground"), ("definition"="external-filter/department/{name:bigint}"), ("format"="json") diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.010.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.010.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.010.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.010.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.999.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.999.ddl.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.999.ddl.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/type-mismatch/test.999.ddl.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.010.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.010.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.010.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.010.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.011.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.011.plan similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.011.plan rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.011.plan diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.020.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.020.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.020.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.020.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.021.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.021.plan similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.021.plan rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.021.plan diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.030.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.030.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.030.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.030.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.031.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.031.plan similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.031.plan rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.031.plan diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.040.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.040.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.040.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.040.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.041.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.041.plan similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.041.plan rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.041.plan diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.110.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.110.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.110.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.110.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.111.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.111.plan similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.111.plan rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.111.plan diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.120.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.120.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.120.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.120.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.121.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.121.plan similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.121.plan rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.121.plan diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.130.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.130.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.130.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.130.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.131.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.131.plan similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/one-field/one-field.131.plan rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/one-field/one-field.131.plan diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.010.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.010.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.010.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.010.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.011.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.011.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.011.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.011.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.012.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.012.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.012.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.012.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.013.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.013.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.013.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.013.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.014.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.014.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.014.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.014.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.015.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.015.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.015.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.015.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.016.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.016.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.016.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.016.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.017.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.017.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.017.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.017.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.018.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.018.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.018.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.018.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.019.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.019.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.019.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.019.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.020.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.020.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.020.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.020.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.021.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.021.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.021.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.021.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.022.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.022.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.022.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.022.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.023.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.023.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.023.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/query/result.023.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/type-mismatch/result.010.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/type-mismatch/result.010.adm similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/type-mismatch/result.010.adm rename to asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/type-mismatch/result.010.adm diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_azure_blob_storage.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_azure_blob_storage.xml index e94132d..024e531 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_azure_blob_storage.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_azure_blob_storage.xml @@ -271,6 +271,30 @@ <!-- </compilation-unit>--> <!-- </test-case>--> <!-- Parquet Tests End --> + <!-- Dynamic prefixes tests start --> + <test-case FilePath="external-dataset/common/dynamic-prefixes"> + <compilation-unit name="one-field"> + <placeholder name="adapter" value="AZUREBLOB" /> + <output-dir compare="Text">one-field</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/common/dynamic-prefixes" check-warnings="true"> + <compilation-unit name="type-mismatch"> + <placeholder name="adapter" value="AZUREBLOB" /> + <output-dir compare="Text">type-mismatch</output-dir> + <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/accounting/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'accounting'. Reason: 'For input string: "accounting"'</expected-warn> + <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/engineering/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'engineering'. Reason: 'For input string: "engineering"'</expected-warn> + <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/hr/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'hr'. Reason: 'For input string: "hr"'</expected-warn> + <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/common/dynamic-prefixes"> + <compilation-unit name="query"> + <placeholder name="adapter" value="AZUREBLOB" /> + <output-dir compare="Text">query</output-dir> + </compilation-unit> + </test-case> + <!-- Dynamic prefixes tests end --> <test-case FilePath="external-dataset"> <compilation-unit name="common/empty-string-definition"> <placeholder name="adapter" value="AZUREBLOB" /> diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml index ce906f6..b28a985 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml @@ -222,13 +222,15 @@ </test-case> <!-- Parquet Tests End --> <!-- Dynamic prefixes tests start --> - <test-case FilePath="external-dataset/s3/filter"> + <test-case FilePath="external-dataset/common/dynamic-prefixes"> <compilation-unit name="one-field"> + <placeholder name="adapter" value="S3" /> <output-dir compare="Text">one-field</output-dir> </compilation-unit> </test-case> - <test-case FilePath="external-dataset/s3/filter" check-warnings="true"> + <test-case FilePath="external-dataset/common/dynamic-prefixes" check-warnings="true"> <compilation-unit name="type-mismatch"> + <placeholder name="adapter" value="S3" /> <output-dir compare="Text">type-mismatch</output-dir> <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/accounting/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'accounting'. Reason: 'For input string: "accounting"'</expected-warn> <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/engineering/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'engineering'. Reason: 'For input string: "engineering"'</expected-warn> @@ -236,8 +238,9 @@ <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn> </compilation-unit> </test-case> - <test-case FilePath="external-dataset/s3/filter"> + <test-case FilePath="external-dataset/common/dynamic-prefixes"> <compilation-unit name="query"> + <placeholder name="adapter" value="S3" /> <output-dir compare="Text">query</output-dir> </compilation-unit> </test-case> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17735 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I78ac712e97ad8371448fbd42b1ea1b737fe743d7 Gerrit-Change-Number: 17735 Gerrit-PatchSet: 2 Gerrit-Owner: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Wail Alkowaileet <[email protected]> Gerrit-MessageType: merged
