Test case changes to metadata tests to integrate with REST test framework
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_result_distribution@1377 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1/issue_251_dataset_hint_1.1.ddl.aql
similarity index 71%
rename from asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1/issue_251_dataset_hint_1.1.ddl.aql
index de0e870..eef69a3 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1/issue_251_dataset_hint_1.1.ddl.aql
@@ -14,12 +14,7 @@
text: string
}
-write output to nc1:"mdtest/basic_issue_251_dataset_hint_1.adm";
-
create dataset Book(LineType)
primary key id
hints( cardinality = 2000);
-for $x in dataset('Metadata.Dataset')
-where $x.DataverseName='test'
-return $x
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1/issue_251_dataset_hint_1.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1/issue_251_dataset_hint_1.2.update.aql
new file mode 100644
index 0000000..a944d98
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1/issue_251_dataset_hint_1.2.update.aql
@@ -0,0 +1,8 @@
+/*
+ * Description : create a dataset providing hints but use whitespace
+ * Expected Res : Success
+ * Date : 29 Jan 2013
+ * Issue : 251
+ */
+
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1/issue_251_dataset_hint_1.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1/issue_251_dataset_hint_1.3.query.aql
new file mode 100644
index 0000000..b8a7827
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1/issue_251_dataset_hint_1.3.query.aql
@@ -0,0 +1,10 @@
+/*
+ * Description : create a dataset providing hints but use whitespace
+ * Expected Res : Success
+ * Date : 29 Jan 2013
+ * Issue : 251
+ */
+
+for $x in dataset('Metadata.Dataset')
+where $x.DataverseName='test'
+return $x
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.1.ddl.aql
similarity index 72%
rename from asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.1.ddl.aql
index 27d2c2c..bb57375 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.1.ddl.aql
@@ -14,12 +14,7 @@
text: string
}
-write output to nc1:"mdtest/basic_issue_251_dataset_hint_2.adm";
-
create dataset Book(LineType)
primary key id
hints(cardinality=2000);
-for $x in dataset('Metadata.Dataset')
-where $x.DataverseName='test'
-return $x
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.2.update.aql
new file mode 100644
index 0000000..7963cc5
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.2.update.aql
@@ -0,0 +1,8 @@
+/*
+ * Description : create a dataset providing a valid hint and do not use any whitespace
+ * Expected Res : Success
+ * Date : 29 Jan 2013
+ * Issue : 251
+ */
+
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.3.query.aql
new file mode 100644
index 0000000..f6520a7
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2/issue_251_dataset_hint_2.3.query.aql
@@ -0,0 +1,10 @@
+/*
+ * Description : create a dataset providing a valid hint and do not use any whitespace
+ * Expected Res : Success
+ * Date : 29 Jan 2013
+ * Issue : 251
+ */
+
+for $x in dataset('Metadata.Dataset')
+where $x.DataverseName='test'
+return $x
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.1.ddl.aql
similarity index 70%
rename from asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.1.ddl.aql
index b6a730f..5941417 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.1.ddl.aql
@@ -14,12 +14,7 @@
text: string
}
-write output to nc1:"mdtest/basic_issue_251_dataset_hint_3.adm";
-
create dataset Book(LineType)
primary key id
hints(CARDINALITY=2000);
-for $x in dataset('Metadata.Dataset')
-where $x.DataverseName='test'
-return $x
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.2.update.aql
new file mode 100644
index 0000000..5c8806a
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.2.update.aql
@@ -0,0 +1,8 @@
+/*
+ * Description : create a dataset providing hint (in upper case)
+ * Expected Res : Success
+ * Date : 29 Jan 2013
+ * Issue : 251
+ */
+
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.3.query.aql
new file mode 100644
index 0000000..bd6abfb
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3/issue_251_dataset_hint_3.3.query.aql
@@ -0,0 +1,10 @@
+/*
+ * Description : create a dataset providing hint (in upper case)
+ * Expected Res : Success
+ * Date : 29 Jan 2013
+ * Issue : 251
+ */
+
+for $x in dataset('Metadata.Dataset')
+where $x.DataverseName='test'
+return $x
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.1.ddl.aql
similarity index 69%
rename from asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.1.ddl.aql
index af7077a..e6ffa31 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.1.ddl.aql
@@ -14,11 +14,6 @@
text: string
}
-write output to nc1:"mdtest/basic_issue_251_dataset_hint_4.adm";
-
create dataset Book(LineType)
primary key id;
-for $x in dataset('Metadata.Dataset')
-where $x.DataverseName='test'
-return $x
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.2.update.aql
new file mode 100644
index 0000000..4d55d7e
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.2.update.aql
@@ -0,0 +1,8 @@
+/*
+ * Description : create a dataset without providing any hints.
+ * Expected Res : Success
+ * Date : 29 Jan 2013
+ * Issue : 251
+ */
+
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.3.query.aql
new file mode 100644
index 0000000..68f96f7
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4/issue_251_dataset_hint_4.3.query.aql
@@ -0,0 +1,11 @@
+/*
+ * Description : create a dataset without providing any hints.
+ * Expected Res : Success
+ * Date : 29 Jan 2013
+ * Issue : 251
+ */
+
+
+for $x in dataset('Metadata.Dataset')
+where $x.DataverseName='test'
+return $x
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta01.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta01/meta01.1.ddl.aql
similarity index 62%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta01.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta01/meta01.1.ddl.aql
index 5ce47ad..29fe385 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta01.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta01/meta01.1.ddl.aql
@@ -7,9 +7,3 @@
drop dataverse testdv if exists;
create dataverse testdv;
-write output to nc1:"mdtest/basic_meta01.adm";
-
-for $l in dataset('Metadata.Dataverse')
-return $l
-
-drop dataverse testdv;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta01/meta01.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta01/meta01.2.update.aql
new file mode 100644
index 0000000..820371a
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta01/meta01.2.update.aql
@@ -0,0 +1,7 @@
+/*
+ * Description : Create dataverse & query Metadata dataset Dataverse to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta01.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta01/meta01.3.query.aql
similarity index 60%
copy from asterix-app/src/test/resources/metadata/queries/basic/meta01.aql
copy to asterix-app/src/test/resources/metadata/queries/basic/meta01/meta01.3.query.aql
index 5ce47ad..ea0fea7 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta01.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta01/meta01.3.query.aql
@@ -4,12 +4,7 @@
* Date : 15 Sep 2012
*/
-drop dataverse testdv if exists;
-create dataverse testdv;
-
-write output to nc1:"mdtest/basic_meta01.adm";
for $l in dataset('Metadata.Dataverse')
return $l
-drop dataverse testdv;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta02.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta02/meta02.1.ddl.aql
similarity index 62%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta02.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta02/meta02.1.ddl.aql
index 7778e99..fab979a 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta02.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta02/meta02.1.ddl.aql
@@ -7,16 +7,9 @@
drop dataverse testdv if exists;
create dataverse testdv;
-write output to nc1:"mdtest/basic_meta02.adm";
-
create type testdv.testtype as open {
id : int32
}
create dataset testdv.dst01(testtype) primary key id;
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName = 'testdv' and $l.DatasetName = 'dst01'
-return $l
-
-drop dataverse testdv;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta02/meta02.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta02/meta02.2.update.aql
new file mode 100644
index 0000000..400cc3f
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta02/meta02.2.update.aql
@@ -0,0 +1,7 @@
+/*
+ * Description : Create dataset & query Metadata dataset Dataset to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta02/meta02.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta02/meta02.3.query.aql
new file mode 100644
index 0000000..14ee97e
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta02/meta02.3.query.aql
@@ -0,0 +1,10 @@
+/*
+ * Description : Create dataset & query Metadata dataset Dataset to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
+for $l in dataset('Metadata.Dataset')
+where $l.DataverseName = 'testdv' and $l.DatasetName = 'dst01'
+return $l
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta03.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta03.aql
deleted file mode 100644
index 0b876f2..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta03.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Description : Create closed type & query Metadata dataset Datatype to verify.
- * Expected Res : Success
- * Date : 15 Sep 2012
- */
-
-drop dataverse testdv if exists;
-create dataverse testdv;
-
-write output to nc1:"mdtest/basic_meta03.adm";
-
-create type testdv.testtype as closed {
-id : int32
-}
-
-for $l in dataset('Metadata.Datatype')
-where $l.DataverseName='testdv' and $l.DatatypeName='testtype'
-return $l
-
-drop dataverse testdv;
-
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta03/meta03.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta03/meta03.1.ddl.aql
new file mode 100644
index 0000000..edeaebf
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta03/meta03.1.ddl.aql
@@ -0,0 +1,13 @@
+/*
+ * Description : Create closed type & query Metadata dataset Datatype to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
+drop dataverse testdv if exists;
+create dataverse testdv;
+
+create type testdv.testtype as closed {
+id : int32
+}
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta03/meta03.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta03/meta03.2.update.aql
new file mode 100644
index 0000000..125f63b
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta03/meta03.2.update.aql
@@ -0,0 +1,7 @@
+/*
+ * Description : Create closed type & query Metadata dataset Datatype to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta03/meta03.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta03/meta03.3.query.aql
new file mode 100644
index 0000000..9861b7f
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta03/meta03.3.query.aql
@@ -0,0 +1,11 @@
+/*
+ * Description : Create closed type & query Metadata dataset Datatype to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
+
+for $l in dataset('Metadata.Datatype')
+where $l.DataverseName='testdv' and $l.DatatypeName='testtype'
+return $l
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta04.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta04.aql
deleted file mode 100644
index b2e7304..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta04.aql
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Description : Create open type & query Metadata dataset Datatype to verify.
- * Expected Res : Success
- * Date : 15 Sep 2012
- */
-
-drop dataverse testdv if exists;
-create dataverse testdv;
-
-write output to nc1:"mdtest/basic_meta04.adm";
-
-create type testdv.testtype as open {
-id : int32
-}
-
-for $l in dataset('Metadata.Datatype')
-where $l.DataverseName='testdv' and $l.DatatypeName='testtype'
-return $l
-
-drop dataverse testdv;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta04/meta04.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta04/meta04.1.ddl.aql
new file mode 100644
index 0000000..77c2793
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta04/meta04.1.ddl.aql
@@ -0,0 +1,12 @@
+/*
+ * Description : Create open type & query Metadata dataset Datatype to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
+drop dataverse testdv if exists;
+create dataverse testdv;
+
+create type testdv.testtype as open {
+id : int32
+}
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta04/meta04.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta04/meta04.2.update.aql
new file mode 100644
index 0000000..14bdd4d
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta04/meta04.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Create open type & query Metadata dataset Datatype to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta04/meta04.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta04/meta04.3.query.aql
new file mode 100644
index 0000000..86c7695
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta04/meta04.3.query.aql
@@ -0,0 +1,11 @@
+/*
+ * Description : Create open type & query Metadata dataset Datatype to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
+
+for $l in dataset('Metadata.Datatype')
+where $l.DataverseName='testdv' and $l.DatatypeName='testtype'
+return $l
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta05.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta05/meta05.1.ddl.aql
similarity index 70%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta05.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta05/meta05.1.ddl.aql
index 201ab6e..de290c9 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta05.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta05/meta05.1.ddl.aql
@@ -7,8 +7,6 @@
drop dataverse testdv if exists;
create dataverse testdv;
-write output to nc1:"mdtest/basic_meta05.adm";
-
create type testdv.testtype as open {
id : int32,
name : string
@@ -18,8 +16,3 @@
create index idx1 on testdv.t1(name);
-for $l in dataset('Metadata.Index')
-where $l.DataverseName='testdv'
-return $l
-
-drop dataverse testdv;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta05/meta05.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta05/meta05.2.update.aql
new file mode 100644
index 0000000..7d65787
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta05/meta05.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Create primary & secondary indexes & query Metadata dataset to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta05/meta05.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta05/meta05.3.query.aql
new file mode 100644
index 0000000..f3459ef
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta05/meta05.3.query.aql
@@ -0,0 +1,10 @@
+/*
+ * Description : Create primary & secondary indexes & query Metadata dataset to verify.
+ * Expected Res : Success
+ * Date : 15 Sep 2012
+ */
+
+for $l in dataset('Metadata.Index')
+where $l.DataverseName='testdv'
+return $l
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta06.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta06/meta06.1.ddl.aql
similarity index 70%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta06.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta06/meta06.1.ddl.aql
index 6297561..9fa0cb2 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta06.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta06/meta06.1.ddl.aql
@@ -7,13 +7,7 @@
drop dataverse testdv if exists;
create dataverse testdv;
-write output to nc1:"mdtest/basic_meta06.adm";
-
create function testdv.fun01(){
"This is an AQL Bodied UDF"
}
-for $l in dataset('Metadata.Function')
-return $l
-
-drop dataverse testdv;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta06/meta06.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta06/meta06.2.update.aql
new file mode 100644
index 0000000..0478520
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta06/meta06.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Create AQL bodied UDFs and verify that there are related entries in metadata Function dataset
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta06/meta06.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta06/meta06.3.query.aql
new file mode 100644
index 0000000..ee7bce6
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta06/meta06.3.query.aql
@@ -0,0 +1,9 @@
+/*
+ * Description : Create AQL bodied UDFs and verify that there are related entries in metadata Function dataset
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
+for $l in dataset('Metadata.Function')
+return $l
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta07/meta07.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta07/meta07.1.ddl.aql
new file mode 100644
index 0000000..a64a472
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta07/meta07.1.ddl.aql
@@ -0,0 +1,7 @@
+/*
+ * Description : Verify default entries for Node dataset in Metadata dataverse
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta07/meta07.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta07/meta07.2.update.aql
new file mode 100644
index 0000000..9c447ca
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta07/meta07.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Verify default entries for Node dataset in Metadata dataverse
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta07.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta07/meta07.3.query.aql
similarity index 83%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta07.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta07/meta07.3.query.aql
index 6544bca..35d13ed 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta07.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta07/meta07.3.query.aql
@@ -6,7 +6,5 @@
// Please note this query was run on two nodes, i.e; two NCs
-write output to nc1:"mdtest/basic_meta07.adm";
-
for $l in dataset('Metadata.Node')
return $l
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta08/meta08.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta08/meta08.1.ddl.aql
new file mode 100644
index 0000000..e12e830
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta08/meta08.1.ddl.aql
@@ -0,0 +1,5 @@
+/*
+ * Description : Verify default entries for Nodegroup dataset in Metadata dataverse
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta08/meta08.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta08/meta08.2.update.aql
new file mode 100644
index 0000000..fbbbb07
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta08/meta08.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Verify default entries for Nodegroup dataset in Metadata dataverse
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta08.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta08/meta08.3.query.aql
similarity index 83%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta08.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta08/meta08.3.query.aql
index a7d536f..b621d68 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta08.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta08/meta08.3.query.aql
@@ -6,7 +6,5 @@
// Please note this query was run on two nodes, i.e; two NCs
-write output to nc1:"mdtest/basic_meta08.adm";
-
for $l in dataset('Metadata.Nodegroup')
return $l
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta09/meta09.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta09/meta09.1.ddl.aql
new file mode 100644
index 0000000..f7ebffc
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta09/meta09.1.ddl.aql
@@ -0,0 +1,15 @@
+/*
+ * Description : Create internal dataset, insert data and query metadata Dataset to verify entries for that dataset.
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
+drop dataverse test if exists;
+create dataverse test;
+
+create type test.testtype as open {
+id:int32
+}
+
+create dataset test.t1(testtype) primary key id;
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta09.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta09/meta09.2.update.aql
similarity index 64%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta09.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta09/meta09.2.update.aql
index 56c6c7a..23e7663 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta09.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta09/meta09.2.update.aql
@@ -4,16 +4,7 @@
* Date : Sep 17 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-
-write output to nc1:"mdtest/basic_meta09.adm";
-
-create type test.testtype as open {
-id:int32
-}
-
-create dataset test.t1(testtype) primary key id;
+use dataverse test;
insert into dataset test.t1({"id":123});
insert into dataset test.t1({"id":133});
@@ -26,8 +17,3 @@
insert into dataset test.t1({"id":373});
insert into dataset test.t1({"id":282});
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='test' and $l.DatasetName='t1'
-return $l
-
-drop dataverse test;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta09/meta09.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta09/meta09.3.query.aql
new file mode 100644
index 0000000..dbe75bd
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta09/meta09.3.query.aql
@@ -0,0 +1,9 @@
+/*
+ * Description : Create internal dataset, insert data and query metadata Dataset to verify entries for that dataset.
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
+for $l in dataset('Metadata.Dataset')
+where $l.DataverseName='test' and $l.DatasetName='t1'
+return $l
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta10.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta10/meta10.1.ddl.aql
similarity index 64%
copy from asterix-app/src/test/resources/metadata/queries/basic/meta10.aql
copy to asterix-app/src/test/resources/metadata/queries/basic/meta10/meta10.1.ddl.aql
index 452dcc3..3fc8148 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta10.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta10/meta10.1.ddl.aql
@@ -8,10 +8,3 @@
create dataverse test;
drop dataverse test if exists;
-write output to nc1:"mdtest/basic_meta10.adm";
-
-count(
-for $l in dataset('Metadata.Dataverse')
-where $l.DataverseName='test'
-return $l
-)
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta10/meta10.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta10/meta10.2.update.aql
new file mode 100644
index 0000000..3431e80
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta10/meta10.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Create dataverse and drop that dataverse and verify dataverse entries in metadata
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta10.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta10/meta10.3.query..aql
similarity index 65%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta10.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta10/meta10.3.query..aql
index 452dcc3..121c1a9 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta10.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta10/meta10.3.query..aql
@@ -4,11 +4,6 @@
* Date : Sep 17 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-drop dataverse test if exists;
-
-write output to nc1:"mdtest/basic_meta10.adm";
count(
for $l in dataset('Metadata.Dataverse')
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta11.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta11/meta11.1.ddl.aql
similarity index 65%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta11.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta11/meta11.1.ddl.aql
index 0e02802..f0a8f31 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta11.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta11/meta11.1.ddl.aql
@@ -7,8 +7,6 @@
drop dataverse test if exists;
create dataverse test;
-write output to nc1:"mdtest/basic_meta11.adm";
-
create type test.testtype as open {
id : int32
}
@@ -17,11 +15,3 @@
drop dataset test.dst01;
-count(
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='test' and $l.DatasetName='dst01'
-return $l
-)
-
-drop dataverse test;
-
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta11/meta11.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta11/meta11.2.update.aql
new file mode 100644
index 0000000..457bdb4
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta11/meta11.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Create dataset and drop that dataset and query Metadata Dataset to verify the drop.
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta11/meta11.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta11/meta11.3.query.aql
new file mode 100644
index 0000000..59c07eb
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta11/meta11.3.query.aql
@@ -0,0 +1,12 @@
+/*
+ * Description : Create dataset and drop that dataset and query Metadata Dataset to verify the drop.
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
+count(
+for $l in dataset('Metadata.Dataset')
+where $l.DataverseName='test' and $l.DatasetName='dst01'
+return $l
+)
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta12.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta12/meta12.1.ddl.aql
similarity index 73%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta12.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta12/meta12.1.ddl.aql
index 82e2eb0..70029c9 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta12.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta12/meta12.1.ddl.aql
@@ -7,8 +7,6 @@
drop dataverse test if exists;
create dataverse test;
-write output to nc1:"mdtest/basic_meta12.adm";
-
create type test.testtype as open {
id : int32,
name : string
@@ -20,8 +18,3 @@
drop index test.dst01.idx1;
-for $l in dataset('Metadata.Index')
-where $l.DatasetName = 'dst01'
-return $l
-
-drop dataverse test;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta12/meta12.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta12/meta12.2.update.aql
new file mode 100644
index 0000000..3a94348
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta12/meta12.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Create secondary index and drop the secondary index and query metadata to verify drop index.
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta12/meta12.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta12/meta12.3.query.aql
new file mode 100644
index 0000000..c451c1c
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta12/meta12.3.query.aql
@@ -0,0 +1,10 @@
+/*
+ * Description : Create secondary index and drop the secondary index and query metadata to verify drop index.
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
+for $l in dataset('Metadata.Index')
+where $l.DatasetName = 'dst01'
+return $l
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta13.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta13/meta13.1.ddl.aql
similarity index 64%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta13.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta13/meta13.1.ddl.aql
index 0c0f627..e6b832f 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta13.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta13/meta13.1.ddl.aql
@@ -8,17 +8,9 @@
drop dataverse test if exists;
create dataverse test;
-write output to nc1:"mdtest/basic_meta13.adm";
-
create function test.foo(){
"drop this function"
}
drop function test.foo@0;
-count(
-for $l in dataset('Metadata.Function')
-where $l.DataverseName='test' and $l.Name='foo' and $l.Arity=0
-return $l);
-
-drop dataverse test;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta13/meta13.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta13/meta13.2.update.aql
new file mode 100644
index 0000000..70e8f18
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta13/meta13.2.update.aql
@@ -0,0 +1,7 @@
+/*
+ * Description : Create functions and drop that function and query metadata
+ * : to verify entries in Function dataset for the dropped UDF.
+ * Expected Res : Success
+ * Date : Sep 17 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta13.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta13/meta13.3.query.aql
similarity index 62%
copy from asterix-app/src/test/resources/metadata/queries/basic/meta13.aql
copy to asterix-app/src/test/resources/metadata/queries/basic/meta13/meta13.3.query.aql
index 0c0f627..ffbe42d 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta13.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta13/meta13.3.query.aql
@@ -5,20 +5,8 @@
* Date : Sep 17 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-
-write output to nc1:"mdtest/basic_meta13.adm";
-
-create function test.foo(){
-"drop this function"
-}
-
-drop function test.foo@0;
-
count(
for $l in dataset('Metadata.Function')
where $l.DataverseName='test' and $l.Name='foo' and $l.Arity=0
return $l);
-drop dataverse test;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta14.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta14/meta14.1.ddl.aql
similarity index 68%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta14.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta14/meta14.1.ddl.aql
index 9103614..c76350b 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta14.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta14/meta14.1.ddl.aql
@@ -13,15 +13,4 @@
bar: int32?
};
-
drop type FooType;
-
-write output to nc1:"mdtest/basic_meta14.adm";
-
-count(
-for $x in dataset('Metadata.Datatype')
-where $x.DataverseName='test'
-return $x
-)
-
-drop dataverse test;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta14/meta14.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta14/meta14.2.update.aql
new file mode 100644
index 0000000..633af93
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta14/meta14.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Test that a synthetically created content type is dropped with its parent type.
+ * Guards against regression to issue 188.
+ * Expected Result : Success
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta14/meta14.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta14/meta14.3.query.aql
new file mode 100644
index 0000000..eb98ab1
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta14/meta14.3.query.aql
@@ -0,0 +1,11 @@
+/*
+ * Description : Test that a synthetically created content type is dropped with its parent type.
+ * Guards against regression to issue 188.
+ * Expected Result : Success
+ */
+
+count(
+for $x in dataset('Metadata.Datatype')
+where $x.DataverseName='test'
+return $x
+)
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta15/meta15.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta15/meta15.1.ddl.aql
new file mode 100644
index 0000000..896d12a
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta15/meta15.1.ddl.aql
@@ -0,0 +1,7 @@
+/*
+ * Description : Query Metadata dataset Adapter to verify to contents.
+ * Expected Res : Success
+ * Date : 25 Nov 2012
+ */
+
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta15/meta15.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta15/meta15.2.update.aql
new file mode 100644
index 0000000..aa03437
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta15/meta15.2.update.aql
@@ -0,0 +1,6 @@
+/*
+ * Description : Query Metadata dataset Adapter to verify to contents.
+ * Expected Res : Success
+ * Date : 25 Nov 2012
+ */
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta15.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta15/meta15.3.query.aql
similarity index 79%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta15.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta15/meta15.3.query.aql
index 91827ef..dc11189 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta15.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta15/meta15.3.query.aql
@@ -4,8 +4,6 @@
* Date : 25 Nov 2012
*/
-write output to nc1:"mdtest/basic_meta15.adm";
-
for $l in dataset('Metadata.DatasourceAdapter')
return $l
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta16.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta16.aql
deleted file mode 100644
index 8b69b4f..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta16.aql
+++ /dev/null
@@ -1,9 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"mdtest/basic_meta16.adm";
-
-for $c in dataset('Dataset')
-return $c
-
-
-
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta16/meta16.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta16/meta16.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta16/meta16.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta16/meta16.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta16/meta16.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta16/meta16.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta16/meta16.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta16/meta16.3.query.aql
new file mode 100644
index 0000000..bbc08e8
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta16/meta16.3.query.aql
@@ -0,0 +1,5 @@
+use dataverse Metadata;
+
+for $c in dataset('Dataset')
+return $c
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta17.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta17.aql
deleted file mode 100644
index 2cd25ee..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta17.aql
+++ /dev/null
@@ -1,6 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"mdtest/basic_meta17.adm";
-
-for $c in dataset('Datatype')
-return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta17/meta17.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta17/meta17.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta17/meta17.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta17/meta17.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta17/meta17.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta17/meta17.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta17/meta17.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta17/meta17.3.query.aql
new file mode 100644
index 0000000..b1e3979
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta17/meta17.3.query.aql
@@ -0,0 +1,4 @@
+use dataverse Metadata;
+
+for $c in dataset('Datatype')
+return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta18.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta18.aql
deleted file mode 100644
index 45f065a..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta18.aql
+++ /dev/null
@@ -1,6 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"mdtest/basic_meta18.adm";
-
-for $c in dataset('Dataverse')
-return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta18/meta18.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta18/meta18.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta18/meta18.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta18/meta18.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta18/meta18.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta18/meta18.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta18/meta18.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta18/meta18.3.query.aql
new file mode 100644
index 0000000..5232cbf
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta18/meta18.3.query.aql
@@ -0,0 +1,4 @@
+use dataverse Metadata;
+
+for $c in dataset('Dataverse')
+return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta19/meta19.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta19/meta19.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta19/meta19.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta19/meta19.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta19/meta19.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta19/meta19.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta19.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta19/meta19.3.query.aql
similarity index 66%
rename from asterix-app/src/test/resources/metadata/queries/basic/meta19.aql
rename to asterix-app/src/test/resources/metadata/queries/basic/meta19/meta19.3.query.aql
index 21de582..d513a28 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta19.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta19/meta19.3.query.aql
@@ -1,7 +1,5 @@
use dataverse Metadata;
-write output to nc1:"mdtest/basic_meta19.adm";
-
for $c in dataset('Index')
where $c.DataverseName='Metadata'
return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta20.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta20.aql
deleted file mode 100644
index 259f23e..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta20.aql
+++ /dev/null
@@ -1,6 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"mdtest/basic_meta20.adm";
-
-for $c in dataset('Node')
-return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta20/meta20.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta20/meta20.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta20/meta20.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta20/meta20.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta20/meta20.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta20/meta20.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta20/meta20.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta20/meta20.3.query.aql
new file mode 100644
index 0000000..701b069
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta20/meta20.3.query.aql
@@ -0,0 +1,4 @@
+use dataverse Metadata;
+
+for $c in dataset('Node')
+return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta21.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta21.aql
deleted file mode 100644
index b5f8110..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta21.aql
+++ /dev/null
@@ -1,6 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"mdtest/basic_meta21.adm";
-
-for $c in dataset('Nodegroup')
-return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta21/meta21.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta21/meta21.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta21/meta21.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta21/meta21.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta21/meta21.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta21/meta21.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta21/meta21.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta21/meta21.3.query.aql
new file mode 100644
index 0000000..d2c69e5
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta21/meta21.3.query.aql
@@ -0,0 +1,4 @@
+use dataverse Metadata;
+
+for $c in dataset('Nodegroup')
+return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset.aql
deleted file mode 100644
index 94f7a58..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset.aql
+++ /dev/null
@@ -1,9 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"rttest/basic_metadata_dataset.adm";
-
-for $c in dataset('Dataset')
-return $c
-
-
-
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset/metadata_dataset.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset/metadata_dataset.1.ddl.aql
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset/metadata_dataset.1.ddl.aql
@@ -0,0 +1 @@
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset/metadata_dataset.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset/metadata_dataset.2.update.aql
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset/metadata_dataset.2.update.aql
@@ -0,0 +1 @@
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset/metadata_dataset.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset/metadata_dataset.3.query.aql
new file mode 100644
index 0000000..bbc08e8
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataset/metadata_dataset.3.query.aql
@@ -0,0 +1,5 @@
+use dataverse Metadata;
+
+for $c in dataset('Dataset')
+return $c
+
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype.aql
deleted file mode 100644
index 4cc94de..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype.aql
+++ /dev/null
@@ -1,6 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"rttest/basic_metadata_datatype.adm";
-
-for $c in dataset('Datatype')
-return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype/metadata_datatype.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype/metadata_datatype.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype/metadata_datatype.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype/metadata_datatype.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype/metadata_datatype.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype/metadata_datatype.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype/metadata_datatype.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype/metadata_datatype.3.query.aql
new file mode 100644
index 0000000..1f19f84
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_datatype/metadata_datatype.3.query.aql
@@ -0,0 +1,4 @@
+use dataverse Metadata;
+
+for $c in dataset('Datatype')
+return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse.aql
deleted file mode 100644
index d3edfed..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse.aql
+++ /dev/null
@@ -1,6 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"rttest/basic_metadata_dataverse.adm";
-
-for $c in dataset('Dataverse')
-return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse/metadata_dataverse.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse/metadata_dataverse.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse/metadata_dataverse.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse/metadata_dataverse.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse/metadata_dataverse.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse/metadata_dataverse.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse/metadata_dataverse.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse/metadata_dataverse.3.query.aql
new file mode 100644
index 0000000..5232cbf
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_dataverse/metadata_dataverse.3.query.aql
@@ -0,0 +1,4 @@
+use dataverse Metadata;
+
+for $c in dataset('Dataverse')
+return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_index.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_index.aql
deleted file mode 100644
index cb78758..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/metadata_index.aql
+++ /dev/null
@@ -1,7 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"rttest/basic_metadata_index.adm";
-
-for $c in dataset('Index')
-where $c.DataverseName='Metadata'
-return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_index/metadata_index.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_index/metadata_index.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_index/metadata_index.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_index/metadata_index.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_index/metadata_index.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_index/metadata_index.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta19.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_index/metadata_index.3.query.aql
similarity index 66%
copy from asterix-app/src/test/resources/metadata/queries/basic/meta19.aql
copy to asterix-app/src/test/resources/metadata/queries/basic/metadata_index/metadata_index.3.query.aql
index 21de582..d513a28 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta19.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_index/metadata_index.3.query.aql
@@ -1,7 +1,5 @@
use dataverse Metadata;
-write output to nc1:"mdtest/basic_meta19.adm";
-
for $c in dataset('Index')
where $c.DataverseName='Metadata'
return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_node.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_node.aql
deleted file mode 100644
index 2d28ed6..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/metadata_node.aql
+++ /dev/null
@@ -1,6 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"rttest/basic_metadata_node.adm";
-
-for $c in dataset('Node')
-return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_node/metadata_node.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_node/metadata_node.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_node/metadata_node.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_node/metadata_node.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_node/metadata_node.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_node/metadata_node.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_node/metadata_node.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_node/metadata_node.3.query.aql
new file mode 100644
index 0000000..701b069
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_node/metadata_node.3.query.aql
@@ -0,0 +1,4 @@
+use dataverse Metadata;
+
+for $c in dataset('Node')
+return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup.aql
deleted file mode 100644
index 86615e6..0000000
--- a/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup.aql
+++ /dev/null
@@ -1,6 +0,0 @@
-use dataverse Metadata;
-
-write output to nc1:"rttest/basic_metadata_nodegroup.adm";
-
-for $c in dataset('Nodegroup')
-return $c
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup/metadata_nodegroup.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup/metadata_nodegroup.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup/metadata_nodegroup.1.ddl.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup/metadata_nodegroup.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup/metadata_nodegroup.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup/metadata_nodegroup.2.update.aql
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup/metadata_nodegroup.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup/metadata_nodegroup.3.query.aql
new file mode 100644
index 0000000..03db518
--- /dev/null
+++ b/asterix-app/src/test/resources/metadata/queries/basic/metadata_nodegroup/metadata_nodegroup.3.query.aql
@@ -0,0 +1,4 @@
+use dataverse Metadata;
+
+for $c in dataset('Nodegroup')
+return $c