commmited changes to cross-dataverse tests to work with REST framework
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_result_distribution@1325 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.1.ddl.aql
index eaec65a..746f986 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.1.ddl.aql
@@ -12,8 +12,6 @@
create dataverse student;
create dataverse teacher;
-write output to nc1:"rttest/cross-dataverse_cross-dv01.adm";
-
create type student.stdType as open {
id : int32,
name : string,
@@ -35,16 +33,3 @@
create dataset teacher.prof(tchrType) primary key id;
create dataset teacher.pstdoc(tchrType) primary key id;
-insert into dataset student.ugdstd({"id":457,"name":"John Doe","age":22,"sex":"M","dept":"Dance"});
-
-insert into dataset student.gdstd({"id":418,"name":"John Smith","age":26,"sex":"M","dept":"Economics"});
-
-insert into dataset teacher.prof({"id":152,"name":"John Meyer","age":42,"sex":"M","dept":"History"});
-
-insert into dataset teacher.pstdoc({"id":259,"name":"Sophia Reece","age":36,"sex":"F","dept":"Anthropology"});
-
-for $s in dataset('student.ugdstd')
-for $p in dataset('teacher.prof')
-for $a in dataset('student.gdstd')
-for $b in dataset('teacher.pstdoc')
-return {"ug-student":$s,"prof":$p,"grd-student":$a,"postdoc":$b}
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.2.update.aql
index eaec65a..74c6cda 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.2.update.aql
@@ -6,34 +6,10 @@
* Date : 29th Aug 2012
*/
-drop dataverse student if exists;
-drop dataverse teacher if exists;
-create dataverse student;
-create dataverse teacher;
+use dataverse student;
+use dataverse teacher;
-write output to nc1:"rttest/cross-dataverse_cross-dv01.adm";
-
-create type student.stdType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create type teacher.tchrType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
insert into dataset student.ugdstd({"id":457,"name":"John Doe","age":22,"sex":"M","dept":"Dance"});
@@ -43,8 +19,3 @@
insert into dataset teacher.pstdoc({"id":259,"name":"Sophia Reece","age":36,"sex":"F","dept":"Anthropology"});
-for $s in dataset('student.ugdstd')
-for $p in dataset('teacher.prof')
-for $a in dataset('student.gdstd')
-for $b in dataset('teacher.pstdoc')
-return {"ug-student":$s,"prof":$p,"grd-student":$a,"postdoc":$b}
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.3.query.aql
index eaec65a..80cdd09 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv01/cross-dv01.3.query.aql
@@ -6,42 +6,6 @@
* Date : 29th Aug 2012
*/
-drop dataverse student if exists;
-drop dataverse teacher if exists;
-
-create dataverse student;
-create dataverse teacher;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv01.adm";
-
-create type student.stdType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create type teacher.tchrType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
-
-insert into dataset student.ugdstd({"id":457,"name":"John Doe","age":22,"sex":"M","dept":"Dance"});
-
-insert into dataset student.gdstd({"id":418,"name":"John Smith","age":26,"sex":"M","dept":"Economics"});
-
-insert into dataset teacher.prof({"id":152,"name":"John Meyer","age":42,"sex":"M","dept":"History"});
-
-insert into dataset teacher.pstdoc({"id":259,"name":"Sophia Reece","age":36,"sex":"F","dept":"Anthropology"});
for $s in dataset('student.ugdstd')
for $p in dataset('teacher.prof')
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.1.ddl.aql
index 4ab7c29..de1cf16 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.1.ddl.aql
@@ -12,8 +12,6 @@
create dataverse student;
create dataverse teacher;
-write output to nc1:"rttest/cross-dataverse_cross-dv02.adm";
-
create type student.stdType as open {
id : int32,
name : string,
@@ -35,14 +33,3 @@
create dataset teacher.prof(tchrType) primary key id;
create dataset teacher.pstdoc(tchrType) primary key id;
-insert into dataset student.ugdstd({"id":457,"name":"John Doe","age":22,"sex":"M","dept":"Dance"});
-
-insert into dataset student.gdstd({"id":418,"name":"John Smith","age":26,"sex":"M","dept":"Economics"});
-
-insert into dataset teacher.prof({"id":152,"name":"John Meyer","age":42,"sex":"M","dept":"History"});
-
-insert into dataset teacher.pstdoc({"id":259,"name":"Sophia Reece","age":36,"sex":"F","dept":"Anthropology"});
-
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='student' or $l.DataverseName='teacher'
-return $l
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.2.update.aql
index 4ab7c29..455bb2f 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.2.update.aql
@@ -6,35 +6,6 @@
* Date : 28th Aug 2012
*/
-drop dataverse student if exists;
-drop dataverse teacher if exists;
-
-create dataverse student;
-create dataverse teacher;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv02.adm";
-
-create type student.stdType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create type teacher.tchrType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
-
insert into dataset student.ugdstd({"id":457,"name":"John Doe","age":22,"sex":"M","dept":"Dance"});
insert into dataset student.gdstd({"id":418,"name":"John Smith","age":26,"sex":"M","dept":"Economics"});
@@ -43,6 +14,3 @@
insert into dataset teacher.pstdoc({"id":259,"name":"Sophia Reece","age":36,"sex":"F","dept":"Anthropology"});
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='student' or $l.DataverseName='teacher'
-return $l
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.3.query.aql
index 4ab7c29..66b6e61 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv02/cross-dv02.3.query.aql
@@ -6,43 +6,6 @@
* Date : 28th Aug 2012
*/
-drop dataverse student if exists;
-drop dataverse teacher if exists;
-
-create dataverse student;
-create dataverse teacher;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv02.adm";
-
-create type student.stdType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create type teacher.tchrType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
-
-insert into dataset student.ugdstd({"id":457,"name":"John Doe","age":22,"sex":"M","dept":"Dance"});
-
-insert into dataset student.gdstd({"id":418,"name":"John Smith","age":26,"sex":"M","dept":"Economics"});
-
-insert into dataset teacher.prof({"id":152,"name":"John Meyer","age":42,"sex":"M","dept":"History"});
-
-insert into dataset teacher.pstdoc({"id":259,"name":"Sophia Reece","age":36,"sex":"F","dept":"Anthropology"});
-
for $l in dataset('Metadata.Dataset')
where $l.DataverseName='student' or $l.DataverseName='teacher'
return $l
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.1.ddl.aql
index a68d428..f9fd731 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.1.ddl.aql
@@ -14,8 +14,6 @@
create dataverse student;
create dataverse teacher;
-write output to nc1:"rttest/cross-dataverse_cross-dv03.adm";
-
create type student.stdType as open {
id : int32,
name : string,
@@ -42,8 +40,3 @@
drop dataset teacher.prof;
drop dataset teacher.pstdoc;
-count(
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='student' or $l.DataverseName='teacher'
-return $l
-)
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.2.update.aql
index a68d428..24b0e09 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.2.update.aql
@@ -7,43 +7,4 @@
* Expected Res : Success
* Date : 28th Aug 2012
*/
-
-drop dataverse student if exists;
-drop dataverse teacher if exists;
-
-create dataverse student;
-create dataverse teacher;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv03.adm";
-
-create type student.stdType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create type teacher.tchrType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
-
-drop dataset student.ugdstd;
-drop dataset student.gdstd;
-drop dataset teacher.prof;
-drop dataset teacher.pstdoc;
-
-count(
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='student' or $l.DataverseName='teacher'
-return $l
-)
+// no inserts, deletes here
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.3.query.aql
index a68d428..e3fe784 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv03/cross-dv03.3.query.aql
@@ -8,40 +8,6 @@
* Date : 28th Aug 2012
*/
-drop dataverse student if exists;
-drop dataverse teacher if exists;
-
-create dataverse student;
-create dataverse teacher;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv03.adm";
-
-create type student.stdType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create type teacher.tchrType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
-
-drop dataset student.ugdstd;
-drop dataset student.gdstd;
-drop dataset teacher.prof;
-drop dataset teacher.pstdoc;
-
count(
for $l in dataset('Metadata.Dataset')
where $l.DataverseName='student' or $l.DataverseName='teacher'
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.1.ddl.aql
index 55a3fa0..b2937c6 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.1.ddl.aql
@@ -15,8 +15,6 @@
create dataverse student;
create dataverse teacher;
-write output to nc1:"rttest/cross-dataverse_cross-dv04.adm";
-
create type student.stdType as open {
id : int32,
name : string,
@@ -48,6 +46,3 @@
create dataset teacher.prof(tchrType) primary key id;
create dataset teacher.pstdoc(tchrType) primary key id;
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='student' or $l.DataverseName='teacher'
-return $l
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.2.update.aql
index 55a3fa0..12746f2 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.2.update.aql
@@ -8,46 +8,4 @@
* Expected Res : Success
* Date : 28th Aug 2012
*/
-
-drop dataverse student if exists;
-drop dataverse teacher if exists;
-
-create dataverse student;
-create dataverse teacher;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv04.adm";
-
-create type student.stdType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create type teacher.tchrType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
-
-drop dataset student.ugdstd;
-drop dataset student.gdstd;
-drop dataset teacher.prof;
-drop dataset teacher.pstdoc;
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
-
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='student' or $l.DataverseName='teacher'
-return $l
+// no inserts, deletes from here
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.3.query.aql
index 55a3fa0..3745d9c 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv04/cross-dv04.3.query.aql
@@ -9,45 +9,6 @@
* Date : 28th Aug 2012
*/
-drop dataverse student if exists;
-drop dataverse teacher if exists;
-
-create dataverse student;
-create dataverse teacher;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv04.adm";
-
-create type student.stdType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create type teacher.tchrType as open {
-id : int32,
-name : string,
-age : int32,
-sex : string,
-dept : string
-}
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
-
-drop dataset student.ugdstd;
-drop dataset student.gdstd;
-drop dataset teacher.prof;
-drop dataset teacher.pstdoc;
-
-create dataset student.ugdstd(stdType) primary key id;
-create dataset student.gdstd(stdType) primary key id;
-create dataset teacher.prof(tchrType) primary key id;
-create dataset teacher.pstdoc(tchrType) primary key id;
-
for $l in dataset('Metadata.Dataset')
where $l.DataverseName='student' or $l.DataverseName='teacher'
return $l
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.1.ddl.aql
index 25e5d67..910e370 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.1.ddl.aql
@@ -8,8 +8,6 @@
drop dataverse test if exists;
create dataverse test;
-write output to nc1:"rttest/cross-dataverse_cross-dv07.adm";
-
create type test.Emp as closed {
id:int32,
fname:string,
@@ -20,15 +18,4 @@
create dataset test.employee(Emp) primary key id;
-load dataset test.employee
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/names.adm"),("format"="delimited-text"),("delimiter"="|"));
-
create index idx_employee_f_l_name on test.employee(fname,lname);
-
-write output to nc1:"rttest/cross-dataverse_cross-dv07.adm";
-
-for $l in dataset('test.employee')
-where $l.fname="Julio" and $l.lname="Isa"
-return $l
-
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.2.update.aql
index 25e5d67..26ba47b 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.2.update.aql
@@ -5,30 +5,10 @@
* Date : 29th August 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv07.adm";
-
-create type test.Emp as closed {
-id:int32,
-fname:string,
-lname:string,
-age:int32,
-dept:string
-}
-
-create dataset test.employee(Emp) primary key id;
+use dataverse test;
load dataset test.employee
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/names.adm"),("format"="delimited-text"),("delimiter"="|"));
-create index idx_employee_f_l_name on test.employee(fname,lname);
-
-write output to nc1:"rttest/cross-dataverse_cross-dv07.adm";
-
-for $l in dataset('test.employee')
-where $l.fname="Julio" and $l.lname="Isa"
-return $l
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.3.query.aql
index 25e5d67..4ecbe22 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv07/cross-dv07.3.query.aql
@@ -5,29 +5,6 @@
* Date : 29th August 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv07.adm";
-
-create type test.Emp as closed {
-id:int32,
-fname:string,
-lname:string,
-age:int32,
-dept:string
-}
-
-create dataset test.employee(Emp) primary key id;
-
-load dataset test.employee
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/names.adm"),("format"="delimited-text"),("delimiter"="|"));
-
-create index idx_employee_f_l_name on test.employee(fname,lname);
-
-write output to nc1:"rttest/cross-dataverse_cross-dv07.adm";
-
for $l in dataset('test.employee')
where $l.fname="Julio" and $l.lname="Isa"
return $l
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.1.ddl.aql
index 8b4a32d..b9f94d2 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.1.ddl.aql
@@ -25,18 +25,6 @@
create dataset test.t1(testtype) primary key id;
create dataset fest.t1(testtype) primary key id;
-insert into dataset test.t1({"id":24});
-insert into dataset test.t1({"id":23});
-insert into dataset test.t1({"id":21});
-insert into dataset test.t1({"id":44});
-insert into dataset test.t1({"id":64});
-
-insert into dataset fest.t1({"id":24});
-insert into dataset fest.t1({"id":23});
-insert into dataset fest.t1({"id":21});
-insert into dataset fest.t1({"id":44});
-insert into dataset fest.t1({"id":64});
-
create function test.f1(){
for $l in dataset('fest.t1')
return $l
@@ -47,6 +35,3 @@
return $m
}
-let $a := test.f1()
-let $b := fest.f1()
-return { "a" : $a, "b" : $b }
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.2.update.aql
index 8b4a32d..fb895d4 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.2.update.aql
@@ -8,23 +8,6 @@
// dv1 - udf1 - dataset1
// dv2 - udf2 - dataset2
-drop dataverse test if exists;
-drop dataverse fest if exists;
-
-create dataverse test;
-create dataverse fest;
-
-create type test.testtype as open {
-id : int32
-}
-
-create type fest.testtype as open {
-id : int32
-}
-
-create dataset test.t1(testtype) primary key id;
-create dataset fest.t1(testtype) primary key id;
-
insert into dataset test.t1({"id":24});
insert into dataset test.t1({"id":23});
insert into dataset test.t1({"id":21});
@@ -37,16 +20,3 @@
insert into dataset fest.t1({"id":44});
insert into dataset fest.t1({"id":64});
-create function test.f1(){
-for $l in dataset('fest.t1')
-return $l
-}
-
-create function fest.f1(){
-for $m in dataset('test.t1')
-return $m
-}
-
-let $a := test.f1()
-let $b := fest.f1()
-return { "a" : $a, "b" : $b }
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.3.query.aql
index 8b4a32d..b81e85f 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv08/cross-dv08.3.query.aql
@@ -8,45 +8,6 @@
// dv1 - udf1 - dataset1
// dv2 - udf2 - dataset2
-drop dataverse test if exists;
-drop dataverse fest if exists;
-
-create dataverse test;
-create dataverse fest;
-
-create type test.testtype as open {
-id : int32
-}
-
-create type fest.testtype as open {
-id : int32
-}
-
-create dataset test.t1(testtype) primary key id;
-create dataset fest.t1(testtype) primary key id;
-
-insert into dataset test.t1({"id":24});
-insert into dataset test.t1({"id":23});
-insert into dataset test.t1({"id":21});
-insert into dataset test.t1({"id":44});
-insert into dataset test.t1({"id":64});
-
-insert into dataset fest.t1({"id":24});
-insert into dataset fest.t1({"id":23});
-insert into dataset fest.t1({"id":21});
-insert into dataset fest.t1({"id":44});
-insert into dataset fest.t1({"id":64});
-
-create function test.f1(){
-for $l in dataset('fest.t1')
-return $l
-}
-
-create function fest.f1(){
-for $m in dataset('test.t1')
-return $m
-}
-
let $a := test.f1()
let $b := fest.f1()
return { "a" : $a, "b" : $b }
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.1.ddl.aql
index 6eea8ac..e9e0b63 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.1.ddl.aql
@@ -11,8 +11,6 @@
create dataverse testdv1;
create dataverse testdv2;
-write output to nc1:"rttest/cross-dataverse_cross-dv09.adm";
-
create function testdv1.fun01(){
"function 01"
}
@@ -21,4 +19,3 @@
"function 02"
}
-testdv1.fun01()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.2.update.aql
index 6eea8ac..347f95a 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.2.update.aql
@@ -6,19 +6,3 @@
* Date : 31st Aug 2012
*/
-drop dataverse testdv1 if exists;
-drop dataverse testdv2 if exists;
-create dataverse testdv1;
-create dataverse testdv2;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv09.adm";
-
-create function testdv1.fun01(){
-"function 01"
-}
-
-create function testdv2.fun02(){
-"function 02"
-}
-
-testdv1.fun01()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.3.query.aql
index 6eea8ac..f650d58 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv09/cross-dv09.3.query.aql
@@ -6,19 +6,6 @@
* Date : 31st Aug 2012
*/
-drop dataverse testdv1 if exists;
-drop dataverse testdv2 if exists;
-create dataverse testdv1;
-create dataverse testdv2;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv09.adm";
-
-create function testdv1.fun01(){
-"function 01"
-}
-
-create function testdv2.fun02(){
-"function 02"
-}
+use dataverse testdv1;
testdv1.fun01()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.1.ddl.aql
index 03b84a7..c3c1df9 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.1.ddl.aql
@@ -10,8 +10,6 @@
create dataverse testdv1;
create dataverse testdv2;
-write output to nc1:"rttest/cross-dataverse_cross-dv11.adm";
-
create function testdv1.fun01(){
testdv2.fun02()
}
@@ -20,4 +18,3 @@
"function 02"
}
-testdv1.fun01()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.2.update.aql
index 03b84a7..8cd46af 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.2.update.aql
@@ -5,19 +5,3 @@
* Date : 31st Aug 2012
*/
-drop dataverse testdv1 if exists;
-drop dataverse testdv2 if exists;
-create dataverse testdv1;
-create dataverse testdv2;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv11.adm";
-
-create function testdv1.fun01(){
-testdv2.fun02()
-}
-
-create function testdv2.fun02(){
-"function 02"
-}
-
-testdv1.fun01()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.3.query.aql
index 03b84a7..bf9e2f2 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv11/cross-dv11.3.query.aql
@@ -5,19 +5,6 @@
* Date : 31st Aug 2012
*/
-drop dataverse testdv1 if exists;
-drop dataverse testdv2 if exists;
-create dataverse testdv1;
-create dataverse testdv2;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv11.adm";
-
-create function testdv1.fun01(){
-testdv2.fun02()
-}
-
-create function testdv2.fun02(){
-"function 02"
-}
+use dataverse testdv1;
testdv1.fun01()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.1.ddl.aql
index e3cde9f..01483c0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.1.ddl.aql
@@ -10,8 +10,6 @@
create dataverse testdv1;
create dataverse testdv2;
-write output to nc1:"rttest/cross-dataverse_cross-dv12.adm";
-
create function testdv1.fun01(){
"function 01"
}
@@ -19,7 +17,3 @@
create function testdv2.fun02(){
"function 02"
}
-
-let $a := testdv1.fun01()
-let $b := testdv2.fun02()
-return {"fun-01":$a,"fun-02":$b}
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.2.update.aql
index e3cde9f..efe27b2 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.2.update.aql
@@ -5,21 +5,3 @@
* Date : 31st Aug 2012
*/
-drop dataverse testdv1 if exists;
-drop dataverse testdv2 if exists;
-create dataverse testdv1;
-create dataverse testdv2;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv12.adm";
-
-create function testdv1.fun01(){
-"function 01"
-}
-
-create function testdv2.fun02(){
-"function 02"
-}
-
-let $a := testdv1.fun01()
-let $b := testdv2.fun02()
-return {"fun-01":$a,"fun-02":$b}
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.3.query.aql
index e3cde9f..8ac926b 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv12/cross-dv12.3.query.aql
@@ -5,20 +5,9 @@
* Date : 31st Aug 2012
*/
-drop dataverse testdv1 if exists;
-drop dataverse testdv2 if exists;
-create dataverse testdv1;
-create dataverse testdv2;
-write output to nc1:"rttest/cross-dataverse_cross-dv12.adm";
-
-create function testdv1.fun01(){
-"function 01"
-}
-
-create function testdv2.fun02(){
-"function 02"
-}
+use dataverse testdv1;
+use dataverse testdv2;
let $a := testdv1.fun01()
let $b := testdv2.fun02()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.1.ddl.aql
index 13e31b9..ef9f50e 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.1.ddl.aql
@@ -11,8 +11,6 @@
create dataverse testdv1;
create dataverse testdv2;
-write output to nc1:"rttest/cross-dataverse_cross-dv13.adm";
-
create function testdv1.fun01(){
testdv2.fun02()
}
@@ -25,4 +23,3 @@
testdv1.fun01()
}
-testdv1.fun01();
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.2.update.aql
index 13e31b9..99b9bb7 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.2.update.aql
@@ -6,23 +6,3 @@
* Ignored : This test is currently not part of the test build, because it being a negative test case expectedly throws an exception.
*/
-drop dataverse testdv1 if exists;
-drop dataverse testdv2 if exists;
-create dataverse testdv1;
-create dataverse testdv2;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv13.adm";
-
-create function testdv1.fun01(){
-testdv2.fun02()
-}
-
-create function testdv2.fun02(){
-testdv2.fun03()
-}
-
-create function testdv2.fun03(){
-testdv1.fun01()
-}
-
-testdv1.fun01();
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.3.query.aql
index 13e31b9..fa54a3c 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv13/cross-dv13.3.query.aql
@@ -6,23 +6,6 @@
* Ignored : This test is currently not part of the test build, because it being a negative test case expectedly throws an exception.
*/
-drop dataverse testdv1 if exists;
-drop dataverse testdv2 if exists;
-create dataverse testdv1;
-create dataverse testdv2;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv13.adm";
-
-create function testdv1.fun01(){
-testdv2.fun02()
-}
-
-create function testdv2.fun02(){
-testdv2.fun03()
-}
-
-create function testdv2.fun03(){
-testdv1.fun01()
-}
+use dataverse testdv1;
testdv1.fun01();
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.1.ddl.aql
index 1c6b863..b176f45 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.1.ddl.aql
@@ -7,11 +7,6 @@
drop dataverse testdv1 if exists;
create dataverse testdv1;
-write output to nc1:"rttest/cross-dataverse_cross-dv14.adm";
-
create function testdv1.fun01(){
100
}
-
-let $a := true
-return testdv1.fun01();
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.2.update.aql
index 1c6b863..0d049ad 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.2.update.aql
@@ -3,15 +3,3 @@
* Expected Res : Success
* Date : 31st Aug 2012
*/
-
-drop dataverse testdv1 if exists;
-create dataverse testdv1;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv14.adm";
-
-create function testdv1.fun01(){
-100
-}
-
-let $a := true
-return testdv1.fun01();
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.3.query.aql
index 1c6b863..e66e35d 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv14/cross-dv14.3.query.aql
@@ -4,14 +4,8 @@
* Date : 31st Aug 2012
*/
-drop dataverse testdv1 if exists;
-create dataverse testdv1;
-write output to nc1:"rttest/cross-dataverse_cross-dv14.adm";
-
-create function testdv1.fun01(){
-100
-}
+use dataverse testdv1;
let $a := true
return testdv1.fun01();
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.1.ddl.aql
index 2aee200..4090d6f 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.1.ddl.aql
@@ -8,8 +8,6 @@
drop dataverse testdv1 if exists;
create dataverse testdv1;
-write output to nc1:"rttest/cross-dataverse_cross-dv15.adm";
-
// UDF with no inputs
create function testdv1.fun01(){
100
@@ -25,6 +23,3 @@
$b+$c
}
-for $l in dataset('Metadata.Function')
-where $l.DataverseName='testdv1'
-return $l;
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.2.update.aql
index 2aee200..e8a113fee 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.2.update.aql
@@ -5,26 +5,3 @@
* Date : 30th Aug 2012
*/
-drop dataverse testdv1 if exists;
-create dataverse testdv1;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv15.adm";
-
-// UDF with no inputs
-create function testdv1.fun01(){
-100
-}
-
-// UDF with one input
-create function testdv1.fun02($a){
-"function 02"
-}
-
-// UDF with two inputs
-create function testdv1.fun03($b,$c){
-$b+$c
-}
-
-for $l in dataset('Metadata.Function')
-where $l.DataverseName='testdv1'
-return $l;
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.3.query.aql
index 2aee200..a6dc422 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv15/cross-dv15.3.query.aql
@@ -5,25 +5,6 @@
* Date : 30th Aug 2012
*/
-drop dataverse testdv1 if exists;
-create dataverse testdv1;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv15.adm";
-
-// UDF with no inputs
-create function testdv1.fun01(){
-100
-}
-
-// UDF with one input
-create function testdv1.fun02($a){
-"function 02"
-}
-
-// UDF with two inputs
-create function testdv1.fun03($b,$c){
-$b+$c
-}
for $l in dataset('Metadata.Function')
where $l.DataverseName='testdv1'
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.1.ddl.aql
index b0ac16d..8f42542 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.1.ddl.aql
@@ -8,8 +8,6 @@
drop dataverse testdv1 if exists;
create dataverse testdv1;
-write output to nc1:"rttest/cross-dataverse_cross-dv16.adm";
-
// UDF with no inputs
create function testdv1.fun01(){
testdv1.fun02()
@@ -29,4 +27,3 @@
testdv1.fun02()
}
-testdv1.fun01()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.2.update.aql
index b0ac16d..2c8ef2c 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.2.update.aql
@@ -5,28 +5,3 @@
* Ignored : Not part of test build, as its a negative test case that thrwos an exception
*/
-drop dataverse testdv1 if exists;
-create dataverse testdv1;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv16.adm";
-
-// UDF with no inputs
-create function testdv1.fun01(){
-testdv1.fun02()
-}
-
-// UDF with one input
-create function testdv1.fun02(){
-testdv1.fun03()
-}
-
-// UDF with two inputs
-create function testdv1.fun03(){
-testdv1.fun04()
-}
-
-create function testdv1.fun04(){
-testdv1.fun02()
-}
-
-testdv1.fun01()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.3.query.aql
index b0ac16d..dc657bb 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv16/cross-dv16.3.query.aql
@@ -5,28 +5,6 @@
* Ignored : Not part of test build, as its a negative test case that thrwos an exception
*/
-drop dataverse testdv1 if exists;
-create dataverse testdv1;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv16.adm";
-
-// UDF with no inputs
-create function testdv1.fun01(){
-testdv1.fun02()
-}
-
-// UDF with one input
-create function testdv1.fun02(){
-testdv1.fun03()
-}
-
-// UDF with two inputs
-create function testdv1.fun03(){
-testdv1.fun04()
-}
-
-create function testdv1.fun04(){
-testdv1.fun02()
-}
+use dataverse testdv1;
testdv1.fun01()
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.1.ddl.aql
index 8e42043..e44d592 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.1.ddl.aql
@@ -23,26 +23,9 @@
create dataset test.t1(testtype) primary key id;
create dataset fest.t1(testtype) primary key id;
-insert into dataset test.t1({"id":24});
-insert into dataset test.t1({"id":23});
-insert into dataset test.t1({"id":21});
-insert into dataset test.t1({"id":44});
-insert into dataset test.t1({"id":64});
-
-insert into dataset fest.t1({"id":24});
-insert into dataset fest.t1({"id":23});
-insert into dataset fest.t1({"id":21});
-insert into dataset fest.t1({"id":44});
-insert into dataset fest.t1({"id":64});
-
create function fest.f1(){
for $m in dataset('test.t1')
for $l in dataset('fest.t1')
order by $m,$l
return { "l":$l,"m":$m }
}
-
-write output to nc1:"rttest/cross-dataverse_cross-dv17.adm";
-
-fest.f1();
-
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.2.update.aql
index 8e42043..a927cf3 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.2.update.aql
@@ -6,23 +6,6 @@
// this test currently gives ParseException
-drop dataverse test if exists;
-drop dataverse fest if exists;
-
-create dataverse test;
-create dataverse fest;
-
-create type test.testtype as open {
-id : int32
-}
-
-create type fest.testtype as open {
-id : int32
-}
-
-create dataset test.t1(testtype) primary key id;
-create dataset fest.t1(testtype) primary key id;
-
insert into dataset test.t1({"id":24});
insert into dataset test.t1({"id":23});
insert into dataset test.t1({"id":21});
@@ -35,14 +18,3 @@
insert into dataset fest.t1({"id":44});
insert into dataset fest.t1({"id":64});
-create function fest.f1(){
-for $m in dataset('test.t1')
-for $l in dataset('fest.t1')
-order by $m,$l
-return { "l":$l,"m":$m }
-}
-
-write output to nc1:"rttest/cross-dataverse_cross-dv17.adm";
-
-fest.f1();
-
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.3.query.aql
index 8e42043..0a8c59f 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv17/cross-dv17.3.query.aql
@@ -6,43 +6,7 @@
// this test currently gives ParseException
-drop dataverse test if exists;
-drop dataverse fest if exists;
-
-create dataverse test;
-create dataverse fest;
-
-create type test.testtype as open {
-id : int32
-}
-
-create type fest.testtype as open {
-id : int32
-}
-
-create dataset test.t1(testtype) primary key id;
-create dataset fest.t1(testtype) primary key id;
-
-insert into dataset test.t1({"id":24});
-insert into dataset test.t1({"id":23});
-insert into dataset test.t1({"id":21});
-insert into dataset test.t1({"id":44});
-insert into dataset test.t1({"id":64});
-
-insert into dataset fest.t1({"id":24});
-insert into dataset fest.t1({"id":23});
-insert into dataset fest.t1({"id":21});
-insert into dataset fest.t1({"id":44});
-insert into dataset fest.t1({"id":64});
-
-create function fest.f1(){
-for $m in dataset('test.t1')
-for $l in dataset('fest.t1')
-order by $m,$l
-return { "l":$l,"m":$m }
-}
-
-write output to nc1:"rttest/cross-dataverse_cross-dv17.adm";
+use dataverse fest;
fest.f1();
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.1.ddl.aql
index 69dd67d..b2a5b54 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.1.ddl.aql
@@ -24,18 +24,3 @@
create dataset test.t1(testtype) primary key id;
create dataset fest.t1(testtype) primary key id;
-insert into dataset test.t1({"id":24});
-insert into dataset test.t1({"id":23});
-insert into dataset test.t1({"id":21});
-insert into dataset test.t1({"id":44});
-insert into dataset test.t1({"id":64});
-
-insert into dataset fest.t1({"id":24});
-insert into dataset fest.t1({"id":23});
-insert into dataset fest.t1({"id":21});
-insert into dataset fest.t1({"id":44});
-insert into dataset fest.t1({"id":64});
-
-let $a := (for $l in dataset('fest.t1') return $l)
-let $b := (for $m in dataset('test.t1') return $m)
-return {"a":$a,"b":$b}
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.2.update.aql
index 69dd67d..c916222 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.2.update.aql
@@ -7,23 +7,6 @@
*/
-drop dataverse test if exists;
-drop dataverse fest if exists;
-
-create dataverse test;
-create dataverse fest;
-
-create type test.testtype as open {
-id : int32
-}
-
-create type fest.testtype as open {
-id : int32
-}
-
-create dataset test.t1(testtype) primary key id;
-create dataset fest.t1(testtype) primary key id;
-
insert into dataset test.t1({"id":24});
insert into dataset test.t1({"id":23});
insert into dataset test.t1({"id":21});
@@ -36,6 +19,3 @@
insert into dataset fest.t1({"id":44});
insert into dataset fest.t1({"id":64});
-let $a := (for $l in dataset('fest.t1') return $l)
-let $b := (for $m in dataset('test.t1') return $m)
-return {"a":$a,"b":$b}
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.3.query.aql
index 69dd67d..fe801df 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv18/cross-dv18.3.query.aql
@@ -7,35 +7,6 @@
*/
-drop dataverse test if exists;
-drop dataverse fest if exists;
-
-create dataverse test;
-create dataverse fest;
-
-create type test.testtype as open {
-id : int32
-}
-
-create type fest.testtype as open {
-id : int32
-}
-
-create dataset test.t1(testtype) primary key id;
-create dataset fest.t1(testtype) primary key id;
-
-insert into dataset test.t1({"id":24});
-insert into dataset test.t1({"id":23});
-insert into dataset test.t1({"id":21});
-insert into dataset test.t1({"id":44});
-insert into dataset test.t1({"id":64});
-
-insert into dataset fest.t1({"id":24});
-insert into dataset fest.t1({"id":23});
-insert into dataset fest.t1({"id":21});
-insert into dataset fest.t1({"id":44});
-insert into dataset fest.t1({"id":64});
-
let $a := (for $l in dataset('fest.t1') return $l)
let $b := (for $m in dataset('test.t1') return $m)
return {"a":$a,"b":$b}
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.1.ddl.aql
index 6a0cf97..55168bd 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.1.ddl.aql
@@ -9,8 +9,6 @@
create dataverse test1;
create dataverse test2;
-write output to nc1:"rttest/cross-dataverse_cross-dv19.adm";
-
create type test1.testtype as open {
id : int32,
name : string,
@@ -49,9 +47,3 @@
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/twitter/extrasmalltweets.txt"),("format"="adm"));
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='test1' or $l.DataverseName='test2' or $l.DataverseName='TwitterData'
-return $l
-
-
-
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.2.update.aql
index 6a0cf97..c0205a8 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.2.update.aql
@@ -4,54 +4,3 @@
* Date : Sep 20 2012
*/
-drop dataverse test1 if exists;
-drop dataverse test2 if exists;
-create dataverse test1;
-create dataverse test2;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv19.adm";
-
-create type test1.testtype as open {
-id : int32,
-name : string,
-loc: point,
-time: datetime
-}
-
-create type test2.testtype as open {
-id : int32,
-name : string?,
-loc: point,
-time: datetime
-}
-
-create type test1.Tweet as open {
- id: int32,
- tweetid: int64,
- loc: point,
- time: datetime,
- text: string
-}
-
-create dataset test1.t1(testtype) primary key id;
-
-create dataset test2.t2(testtype) primary key id;
-
-create dataset test2.t3(testtype) primary key id;
-
-create dataset test1.t2(testtype) primary key id;
-
-create dataset test1.t3(testtype) primary key id;
-
-create dataset test2.t4(testtype) primary key id;
-
-create external dataset test1.TwitterData(Tweet)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/twitter/extrasmalltweets.txt"),("format"="adm"));
-
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName='test1' or $l.DataverseName='test2' or $l.DataverseName='TwitterData'
-return $l
-
-
-
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.3.query.aql
index 6a0cf97..e7e4f41 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/cross-dv19/cross-dv19.3.query.aql
@@ -4,54 +4,7 @@
* Date : Sep 20 2012
*/
-drop dataverse test1 if exists;
-drop dataverse test2 if exists;
-create dataverse test1;
-create dataverse test2;
-
-write output to nc1:"rttest/cross-dataverse_cross-dv19.adm";
-
-create type test1.testtype as open {
-id : int32,
-name : string,
-loc: point,
-time: datetime
-}
-
-create type test2.testtype as open {
-id : int32,
-name : string?,
-loc: point,
-time: datetime
-}
-
-create type test1.Tweet as open {
- id: int32,
- tweetid: int64,
- loc: point,
- time: datetime,
- text: string
-}
-
-create dataset test1.t1(testtype) primary key id;
-
-create dataset test2.t2(testtype) primary key id;
-
-create dataset test2.t3(testtype) primary key id;
-
-create dataset test1.t2(testtype) primary key id;
-
-create dataset test1.t3(testtype) primary key id;
-
-create dataset test2.t4(testtype) primary key id;
-
-create external dataset test1.TwitterData(Tweet)
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/twitter/extrasmalltweets.txt"),("format"="adm"));
-
for $l in dataset('Metadata.Dataset')
where $l.DataverseName='test1' or $l.DataverseName='test2' or $l.DataverseName='TwitterData'
return $l
-
-
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.1.ddl.aql
index 860dd74..359588a 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.1.ddl.aql
@@ -19,13 +19,7 @@
}
};
-create dataset test.Customers(CustomerType)
-primary key cid;
+create dataset test.Customers(CustomerType) primary key cid;
drop dataset test.Customers;
-write output to nc1:"rttest/cross-dataverse_drop_dataset.adm";
-
-for $x in dataset('Metadata.Dataset')
-where $x.DataverseName='test' and $x.DatasetName='Customers'
-return $x
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.2.update.aql
index 860dd74..1ecf3aa 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.2.update.aql
@@ -1,31 +1 @@
-drop dataverse test if exists;
-create dataverse test;
-
-create type test.AddressType as open {
- number: int32,
- street: string,
- city: string
-};
-
-create type test.CustomerType as closed {
- cid: int32,
- name: string,
- cashBack: int32,
- age: int32?,
- address: AddressType?,
- lastorder: {
- oid: int32,
- total: float
- }
-};
-
-create dataset test.Customers(CustomerType)
-primary key cid;
-
-drop dataset test.Customers;
-
-write output to nc1:"rttest/cross-dataverse_drop_dataset.adm";
-
-for $x in dataset('Metadata.Dataset')
-where $x.DataverseName='test' and $x.DatasetName='Customers'
-return $x
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.3.query.aql
index 860dd74..9f761a4 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/drop_dataset/drop_dataset.3.query.aql
@@ -1,31 +1,3 @@
-drop dataverse test if exists;
-create dataverse test;
-
-create type test.AddressType as open {
- number: int32,
- street: string,
- city: string
-};
-
-create type test.CustomerType as closed {
- cid: int32,
- name: string,
- cashBack: int32,
- age: int32?,
- address: AddressType?,
- lastorder: {
- oid: int32,
- total: float
- }
-};
-
-create dataset test.Customers(CustomerType)
-primary key cid;
-
-drop dataset test.Customers;
-
-write output to nc1:"rttest/cross-dataverse_drop_dataset.adm";
-
for $x in dataset('Metadata.Dataset')
where $x.DataverseName='test' and $x.DatasetName='Customers'
return $x
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.aql
index 2395a48..baf7f67 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.aql
@@ -41,25 +41,7 @@
}
};
-create dataset test1.Customers(CustomerType)
-primary key cid;
+create dataset test1.Customers(CustomerType) primary key cid;
-create dataset test2.Customers(CustomerType)
-primary key cid;
-
-load dataset test1.Customers
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/nontagged/customerData.json"),("format"="adm"));
-
-
-insert into dataset test2.Customers(
-for $x in dataset('test1.Customers')
-return $x
-);
-
-write output to nc1:"rttest/cross-dataverse_insert_across_dataverses.adm";
-
-for $c in dataset('test2.Customers')
-order by $c.cid
-return $c
+create dataset test2.Customers(CustomerType) primary key cid;
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.2.update.aql
index 2395a48..0e5b3a0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.2.update.aql
@@ -1,65 +1,9 @@
//***** Test to read from a dataset and insert into another dataset when the datasets belong to different dataverses*****//
-drop dataverse test1 if exists;
-drop dataverse test2 if exists;
-
-create dataverse test1;
-create dataverse test2;
-
-create type test1.AddressType as open {
- number: int32,
- street: string,
- city: string
-};
-
-create type test1.CustomerType as closed {
- cid: int32,
- name: string,
- cashBack: int32,
- age: int32?,
- address: AddressType?,
- lastorder: {
- oid: int32,
- total: float
- }
-};
-
-create type test2.AddressType as open {
- number: int32,
- street: string,
- city: string
-};
-
-create type test2.CustomerType as closed {
- cid: int32,
- name: string,
- cashBack: int32,
- age: int32?,
- address: AddressType?,
- lastorder: {
- oid: int32,
- total: float
- }
-};
-
-create dataset test1.Customers(CustomerType)
-primary key cid;
-
-create dataset test2.Customers(CustomerType)
-primary key cid;
load dataset test1.Customers
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/nontagged/customerData.json"),("format"="adm"));
-
insert into dataset test2.Customers(
for $x in dataset('test1.Customers')
return $x
-);
-
-write output to nc1:"rttest/cross-dataverse_insert_across_dataverses.adm";
-
-for $c in dataset('test2.Customers')
-order by $c.cid
-return $c
-
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.query.aql
index 2395a48..89a5f00 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.query.aql
@@ -1,63 +1,6 @@
//***** Test to read from a dataset and insert into another dataset when the datasets belong to different dataverses*****//
-drop dataverse test1 if exists;
-drop dataverse test2 if exists;
-create dataverse test1;
-create dataverse test2;
-
-create type test1.AddressType as open {
- number: int32,
- street: string,
- city: string
-};
-
-create type test1.CustomerType as closed {
- cid: int32,
- name: string,
- cashBack: int32,
- age: int32?,
- address: AddressType?,
- lastorder: {
- oid: int32,
- total: float
- }
-};
-
-create type test2.AddressType as open {
- number: int32,
- street: string,
- city: string
-};
-
-create type test2.CustomerType as closed {
- cid: int32,
- name: string,
- cashBack: int32,
- age: int32?,
- address: AddressType?,
- lastorder: {
- oid: int32,
- total: float
- }
-};
-
-create dataset test1.Customers(CustomerType)
-primary key cid;
-
-create dataset test2.Customers(CustomerType)
-primary key cid;
-
-load dataset test1.Customers
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/nontagged/customerData.json"),("format"="adm"));
-
-
-insert into dataset test2.Customers(
-for $x in dataset('test1.Customers')
-return $x
-);
-
-write output to nc1:"rttest/cross-dataverse_insert_across_dataverses.adm";
+use dataverse test2;
for $c in dataset('test2.Customers')
order by $c.cid
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.aql
index 3c96539..23e88eb 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.aql
@@ -12,30 +12,6 @@
name : string
}
-write output to nc1:"rttest/cross-dataverse_insert_from_source_dataset.adm";
-
create dataset test.t1(testtype) primary key id;
-insert into dataset test.t1({"id":456,"name":"Roger"});
-insert into dataset test.t1({"id":351,"name":"Bob"});
-insert into dataset test.t1({"id":257,"name":"Sammy"});
-insert into dataset test.t1({"id":926,"name":"Richard"});
-insert into dataset test.t1({"id":482,"name":"Kevin"});
-
create dataset test.t2(testtype) primary key id;
-
-insert into dataset test.t2({"id":438,"name":"Ravi"});
-insert into dataset test.t2({"id":321,"name":"Bobby"});
-insert into dataset test.t2({"id":219,"name":"Sam"});
-insert into dataset test.t2({"id":851,"name":"Ricardo"});
-insert into dataset test.t2({"id":201,"name":"Kelvin"});
-
-insert into dataset test.t1(for $l in dataset('test.t2') return $l);
-
-for $l in dataset('test.t1')
-order by $l.id
-return $l;
-
-drop dataset test.t1 if exists;
-
-drop dataverse test if exists;
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.2.update.aql
index 3c96539..02ec537 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.2.update.aql
@@ -4,17 +4,6 @@
* Date : Sep 19 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-
-create type test.testtype as open {
-id : int32,
-name : string
-}
-
-write output to nc1:"rttest/cross-dataverse_insert_from_source_dataset.adm";
-
-create dataset test.t1(testtype) primary key id;
insert into dataset test.t1({"id":456,"name":"Roger"});
insert into dataset test.t1({"id":351,"name":"Bob"});
@@ -22,8 +11,6 @@
insert into dataset test.t1({"id":926,"name":"Richard"});
insert into dataset test.t1({"id":482,"name":"Kevin"});
-create dataset test.t2(testtype) primary key id;
-
insert into dataset test.t2({"id":438,"name":"Ravi"});
insert into dataset test.t2({"id":321,"name":"Bobby"});
insert into dataset test.t2({"id":219,"name":"Sam"});
@@ -31,11 +18,3 @@
insert into dataset test.t2({"id":201,"name":"Kelvin"});
insert into dataset test.t1(for $l in dataset('test.t2') return $l);
-
-for $l in dataset('test.t1')
-order by $l.id
-return $l;
-
-drop dataset test.t1 if exists;
-
-drop dataverse test if exists;
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.3.query.aql
index 3c96539..15cf8f5 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.3.query.aql
@@ -4,38 +4,8 @@
* Date : Sep 19 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-
-create type test.testtype as open {
-id : int32,
-name : string
-}
-
-write output to nc1:"rttest/cross-dataverse_insert_from_source_dataset.adm";
-
-create dataset test.t1(testtype) primary key id;
-
-insert into dataset test.t1({"id":456,"name":"Roger"});
-insert into dataset test.t1({"id":351,"name":"Bob"});
-insert into dataset test.t1({"id":257,"name":"Sammy"});
-insert into dataset test.t1({"id":926,"name":"Richard"});
-insert into dataset test.t1({"id":482,"name":"Kevin"});
-
-create dataset test.t2(testtype) primary key id;
-
-insert into dataset test.t2({"id":438,"name":"Ravi"});
-insert into dataset test.t2({"id":321,"name":"Bobby"});
-insert into dataset test.t2({"id":219,"name":"Sam"});
-insert into dataset test.t2({"id":851,"name":"Ricardo"});
-insert into dataset test.t2({"id":201,"name":"Kelvin"});
-
-insert into dataset test.t1(for $l in dataset('test.t2') return $l);
+use dataverse test;
for $l in dataset('test.t1')
order by $l.id
return $l;
-
-drop dataset test.t1 if exists;
-
-drop dataverse test if exists;
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.aql
index 197baaa..afba395 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.aql
@@ -41,20 +41,3 @@
create dataset test2.Orders(OrderType)
primary key oid;
-
-load dataset test1.Customers
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/nontagged/customerData.json"),
-("format"="adm"));
-
-load dataset test2.Orders
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/nontagged/orderData.json"),("format"="adm"));
-
-write output to nc1:"rttest/cross-dataverse_join_across_dataverses.adm";
-
-for $c in dataset('test1.Customers')
-for $o in dataset('test2.Orders')
-where $c.cid = $o.cid
-order by $c.name, $o.total
-return {"cust_name":$c.name, "cust_age": $c.age, "order_total":$o.total, "orderList":[$o.oid, $o.cid]}
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.2.update.aql
index 197baaa..a38a397 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.2.update.aql
@@ -1,46 +1,7 @@
//***** Test to conduct a join between datasets belonging to different dataverses*****//
-drop dataverse test1 if exists;
-drop dataverse test2 if exists;
-
-create dataverse test1;
-create dataverse test2;
-
-create type test1.AddressType as open {
- number: int32,
- street: string,
- city: string
-};
-
-create type test1.CustomerType as closed {
- cid: int32,
- name: string,
- cashBack: int32,
- age: int32?,
- address: AddressType?,
- lastorder: {
- oid: int32,
- total: float
- }
-};
-
-create dataset test1.Customers(CustomerType)
-primary key cid;
-
-
-create type test2.OrderType as open {
- oid: int32,
- cid: int32,
- orderstatus: string,
- orderpriority: string,
- clerk: string,
- total: float,
- items: [int32]
-}
-
-create dataset test2.Orders(OrderType)
-primary key oid;
-
+use dataverse test1;
+use dataverse test2;
load dataset test1.Customers
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
@@ -51,10 +12,3 @@
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/nontagged/orderData.json"),("format"="adm"));
-write output to nc1:"rttest/cross-dataverse_join_across_dataverses.adm";
-
-for $c in dataset('test1.Customers')
-for $o in dataset('test2.Orders')
-where $c.cid = $o.cid
-order by $c.name, $o.total
-return {"cust_name":$c.name, "cust_age": $c.age, "order_total":$o.total, "orderList":[$o.oid, $o.cid]}
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.3.query.aql
index 197baaa..85fbcc7 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/join_across_dataverses/join_across_dataverses.3.query.aql
@@ -1,57 +1,8 @@
//***** Test to conduct a join between datasets belonging to different dataverses*****//
-drop dataverse test1 if exists;
-drop dataverse test2 if exists;
-create dataverse test1;
-create dataverse test2;
-
-create type test1.AddressType as open {
- number: int32,
- street: string,
- city: string
-};
-
-create type test1.CustomerType as closed {
- cid: int32,
- name: string,
- cashBack: int32,
- age: int32?,
- address: AddressType?,
- lastorder: {
- oid: int32,
- total: float
- }
-};
-
-create dataset test1.Customers(CustomerType)
-primary key cid;
-
-
-create type test2.OrderType as open {
- oid: int32,
- cid: int32,
- orderstatus: string,
- orderpriority: string,
- clerk: string,
- total: float,
- items: [int32]
-}
-
-create dataset test2.Orders(OrderType)
-primary key oid;
-
-
-load dataset test1.Customers
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/nontagged/customerData.json"),
-("format"="adm"));
-
-load dataset test2.Orders
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/nontagged/orderData.json"),("format"="adm"));
-
-write output to nc1:"rttest/cross-dataverse_join_across_dataverses.adm";
+use dataverse test1;
+use dataverse test2;
for $c in dataset('test1.Customers')
for $o in dataset('test2.Orders')
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.1.ddl.aql
index 777613c..aecf315 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.1.ddl.aql
@@ -1,8 +1 @@
-write output to nc1:"rttest/cross-dataverse_metadata_dataset.adm";
-
-for $c in dataset('Metadata.Dataset')
-where $c.DataverseName='Metadata'
-return $c
-
-
-
+// no DDLs
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.2.update.aql
index 777613c..1ecf3aa 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.2.update.aql
@@ -1,8 +1 @@
-write output to nc1:"rttest/cross-dataverse_metadata_dataset.adm";
-
-for $c in dataset('Metadata.Dataset')
-where $c.DataverseName='Metadata'
-return $c
-
-
-
+// no inserts, deletes
diff --git a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.3.query.aql
index 777613c..9da9446 100644
--- a/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.3.query.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/cross-dataverse/metadata_dataset/metadata_dataset.3.query.aql
@@ -1,8 +1,6 @@
-write output to nc1:"rttest/cross-dataverse_metadata_dataset.adm";
+//Query metadata dataset
for $c in dataset('Metadata.Dataset')
where $c.DataverseName='Metadata'
return $c
-
-