Removed nodegroups from more tests - Iteration 2
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization@178 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql
index 64ffd8b..4268231 100644
--- a/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/comparison/datetime_range.aql
@@ -10,10 +10,8 @@
text: string
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset TwitterData(Tweet)
- partitioned by key id on group1;
+ partitioned by key id;
load dataset TwitterData
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
@@ -23,4 +21,4 @@
for $t in dataset('TwitterData')
where $t.time > datetime("2011-05-15T16:00:00Z") and $t.time < datetime("2011-05-15T21:59:59Z")
order by $t.id
-return { "id": $t.id }
\ No newline at end of file
+return { "id": $t.id }
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/co.aql b/asterix-app/src/test/resources/runtimets/queries/custord/co.aql
index ccacb66..879b2b8 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/co.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/co.aql
@@ -21,7 +21,6 @@
}
}
-
create type OrderType as open {
oid: int32,
cid: int32,
@@ -37,15 +36,12 @@
orders: [OrderType]
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset Customers3(CustomerType)
- partitioned by key cid on group1;
+ partitioned by key cid;
create dataset Orders3(OrderType)
- partitioned by key oid on group1;
+ partitioned by key oid;
create dataset CustomerOrders3(CustomerOrdersType)
- partitioned by key cid on group1;
-
+ partitioned by key cid;
write output to nc1:"rttest/custord_co.adm";
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql
index 83a72ee..04f7669 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/customer_q_01.aql
@@ -22,8 +22,6 @@
}
}
-
-
create external dataset Customers(CustomerType)
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/nontagged/customerData.json"),("format"="adm"));
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql
index e951abc..decc8bb 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_01.aql
@@ -21,9 +21,6 @@
}
}
-
-
-
create type OrderType as open {
oid: int32,
cid: int32,
@@ -39,14 +36,12 @@
orders: [OrderType]
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset Customers1(CustomerType)
- partitioned by key cid on group1;
+ partitioned by key cid;
create dataset Orders1(OrderType)
- partitioned by key oid on group1;
+ partitioned by key oid;
create dataset CustomerOrders1(CustomerOrdersType)
- partitioned by key cid on group1;
+ partitioned by key cid;
load dataset Customers1
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
@@ -56,10 +51,8 @@
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/custord-tiny/order-tiny.adm"),("format"="adm")) pre-sorted;
-
// write output to nc1:"rttest/denorm-cust-order_01.adm";
-
write into dataset CustomerOrders1 (
for $c in dataset('Customers1')
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql
index 39815d7..2ac6910 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_02.aql
@@ -21,9 +21,6 @@
}
}
-
-
-
create type OrderType as open {
oid: int32,
cid: int32,
@@ -39,14 +36,12 @@
orders: [OrderType]
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset Customers2(CustomerType)
- partitioned by key cid on group1;
+ partitioned by key cid;
create dataset Orders2(OrderType)
- partitioned by key oid on group1;
+ partitioned by key oid;
create dataset CustomerOrders2(CustomerOrdersType)
- partitioned by key cid on group1;
+ partitioned by key cid;
load dataset Customers2
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
@@ -56,7 +51,6 @@
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/custord-tiny/order-tiny.adm"),("format"="adm")) pre-sorted;
-
write into dataset CustomerOrders2 (
for $c in dataset('Customers2')
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql
index 978bedf..324dbb0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/denorm-cust-order_03.aql
@@ -4,8 +4,6 @@
use dataverse test;
-
-
create type AddressType as open {
number: int32,
street: string,
@@ -38,14 +36,12 @@
orders: [OrderType]
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset Customers3(CustomerType)
- partitioned by key cid on group1;
+ partitioned by key cid;
create dataset Orders3(OrderType)
- partitioned by key oid on group1;
+ partitioned by key oid;
create dataset CustomerOrders3(CustomerOrdersType)
- partitioned by key cid on group1;
+ partitioned by key cid;
load dataset Customers3
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql b/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql
index d6eb4c4..cd4ef0e 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/freq-clerk.aql
@@ -27,10 +27,8 @@
total: float
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset CustomerOrders(CustomerOrderType)
- partitioned by key cid on group1;
+ partitioned by key cid;
load dataset CustomerOrders
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql
index 2a6a37b..ddde56e 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/join_q_01.aql
@@ -22,8 +22,6 @@
}
}
-
-
create type OrderType as open {
oid: int32,
cid: int32,
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql b/asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql
index ae2d750..5f73e4b 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/load-test.aql
@@ -1,5 +1,4 @@
drop dataverse test if exists;
-drop nodegroup group0 if exists;
create dataverse test;
use dataverse test;
@@ -21,13 +20,10 @@
}
}
-create nodegroup group0 if not exists on nc1;
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset c1(CustomerType)
- partitioned by key cid on group0;
+ partitioned by key cid;
create dataset c2(CustomerType)
- partitioned by key cid on group1;
+ partitioned by key cid;
load dataset c1
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
@@ -49,7 +45,6 @@
return $c
-
// write output to nc1:"rttest/denorm-cust-order_01.adm";
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql
index 36e6830..0fb9218 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_01.aql
@@ -15,7 +15,6 @@
}
-
create external dataset Orders(OrderType)
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/nontagged/orderData.json"),("format"="adm"));
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql
index a16eab6..08856e9 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_02.aql
@@ -15,7 +15,6 @@
}
-
create external dataset Orders(OrderType)
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/nontagged/orderData.json"),("format"="adm"));
diff --git a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql
index c9b22d8..b2d55d9 100644
--- a/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/custord/order_q_04.aql
@@ -15,7 +15,6 @@
}
-
create external dataset Orders(OrderType)
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/nontagged/orderData.json"),("format"="adm"));
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql
index df75811..e55a643 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dapd/q1.aql
@@ -3,7 +3,6 @@
create dataverse test;
use dataverse test;
-
create type AddressType as closed {
street: string,
city: string,
@@ -25,8 +24,6 @@
}}
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create external dataset User(UserType)
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/events/tiny/user.adm"),("format"="adm"));
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql
index 171fb02..545e31f 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dapd/q2.aql
@@ -31,10 +31,6 @@
end_time: datetime
}
-
-
-create nodegroup group1 if not exists on nc1, nc2;
-
create external dataset Event(EventType)
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/events/tiny/event.adm"),("format"="adm"));
diff --git a/asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql b/asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql
index 9c871b2..23e4557 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dapd/q3.aql
@@ -23,17 +23,13 @@
}}
}
-
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset User(UserType)
- partitioned by key name on group1;
+ partitioned by key name;
load dataset User
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/events/tiny/user.adm"),("format"="json")) pre-sorted;
-
write output to nc1:'rttest/dapd_q3.adm';
set simthreshold '.5f';
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/delete-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/delete-with-index.aql
index b1ad097..fdd9cba 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/delete-with-index.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/delete-with-index.aql
@@ -22,15 +22,13 @@
l_comment: string
}
-create nodegroup group1 if not exists on nc1, nc2;
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineItem
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
create index idx_LineItem_partkey on LineItem(l_linenumber);
create index idx_LineItem_suppkey on LineItem(l_suppkey);
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/delete.aql b/asterix-app/src/test/resources/runtimets/queries/dml/delete.aql
index cdd0315..22a540a 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/delete.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/delete.aql
@@ -22,16 +22,13 @@
l_comment: string
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineItem
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
delete $l from dataset LineItem where $l.l_orderkey>=10;
write output to nc1:"rttest/dml_delete.adm";
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-tuple-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-tuple-with-index.aql
index fcc83d6..2236aed 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/insert-tuple-with-index.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/insert-tuple-with-index.aql
@@ -9,16 +9,13 @@
l_suppkey: int32
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset LineID(LineIDType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineID
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/tpch0.001/lineitem_0.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
create index idx_LineID_partkey on LineID(l_linenumber);
create index idx_LineID_suppkey on LineID(l_suppkey);
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-tuple.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-tuple.aql
index 731f7cd..27250ae 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/insert-tuple.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/insert-tuple.aql
@@ -9,16 +9,13 @@
l_suppkey: int32
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset LineID(LineIDType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineID
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/tpch0.001/lineitem_0.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
insert into dataset LineID (
let $x:=1
let $y:=2
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-wisc.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-wisc.aql
index 4e9e594..e1825d0 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/insert-wisc.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/insert-wisc.aql
@@ -4,8 +4,6 @@
use dataverse test;
-create nodegroup group1 if not exists on nc1, nc2;
-
create type Schema as closed {
unique1: int32,
unique2: int32,
@@ -25,9 +23,9 @@
string4: string
}
-create dataset onektup(Schema) partitioned by key unique2 on group1;
+create dataset onektup(Schema) partitioned by key unique2;
-create dataset tenktup1(Schema) partitioned by key unique2 on group1;
+create dataset tenktup1(Schema) partitioned by key unique2;
load dataset onektup
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
@@ -37,7 +35,7 @@
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/wisc/tenktup.adm"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-create dataset tmp(Schema) partitioned by key unique2 on group1;
+create dataset tmp(Schema) partitioned by key unique2;
load dataset tmp
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert-with-index.aql
index ec30668..e14af7e 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/insert-with-index.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/insert-with-index.aql
@@ -28,13 +28,11 @@
l_suppkey: int32
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
create dataset LineID(LineIDType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineItem
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert.aql
index 2123aa8..8062ce1 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/insert.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/insert.aql
@@ -28,13 +28,11 @@
l_suppkey: int32
}
-create nodegroup group1 if not exists on nc1;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
create dataset LineID(LineIDType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineItem
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql b/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql
index 80cb4f5..d3efad9 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/insert_less_nc.aql
@@ -28,13 +28,11 @@
l_suppkey: int32
}
-create nodegroup group1nc2 if not exists on nc2;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1nc2;
+ partitioned by key l_orderkey, l_linenumber;
create dataset LineID(LineIDType)
- partitioned by key l_orderkey, l_linenumber on group1nc2;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineItem
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql b/asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql
index c6fef4b..4641c68 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/load-from-hdfs.aql
@@ -22,11 +22,8 @@
l_comment: string
}
-
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
//load dataset LineItem
//using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql
index 38df3ef..efab267 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/load-with-index.aql
@@ -21,10 +21,8 @@
l_comment: string
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
create index idx_partkey on LineItem(l_partkey);
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql
index d72372f..0c71f54 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert.aql
@@ -1,15 +1,12 @@
create dataverse testdv2;
use dataverse testdv2;
-
create type testtype as open {
id: string,
name: string
}
-create nodegroup grouptest on nc1;
-
-create dataset testds(testtype) partitioned by key id on grouptest;
+create dataset testds(testtype) partitioned by key id;
insert into dataset testds (
{ "id": "001", "name": "Person Three", "hobbies": {{"scuba", "music"}}}
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql
index 8339bc2..db5ee2e 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2.aql
@@ -13,8 +13,7 @@
insert into dataset testds( for $i in range(1,10) return { "id":$i,"name":"John Doe" });
-
write output to nc1:"rttest/dml_opentype-insert2.adm";
for $l in dataset('testds')
order by $l.id
-return $l
\ No newline at end of file
+return $l
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql
index bb2f934..6201ca2 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/scan-delete-rtree-secondary-index.aql
@@ -13,10 +13,8 @@
rec: rectangle
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset MyData(MyRecord)
- partitioned by key id on group1;
+ partitioned by key id;
load dataset MyData
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql
index fe9c017..236b4a9 100644
--- a/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/dml/scan-insert-rtree-secondary-index.aql
@@ -18,18 +18,15 @@
point: point
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset MyData(MyRecord)
- partitioned by key id on group1;
+ partitioned by key id;
load dataset MyData
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
create dataset MyMiniData(MyMiniRecord)
- partitioned by key id on group1;
+ partitioned by key id;
load dataset MyMiniData
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql
index 0ad2dde..465d94f 100644
--- a/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/failure/delete-rtree.aql
@@ -11,17 +11,13 @@
text: string
}
-
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset MyData(MyRecord)
- partitioned by key id on group1;
+ partitioned by key id;
load dataset MyData
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/twitter/smalltweets.txt"),("format"="adm")) pre-sorted;
-
delete $l from dataset MyData where $l.id>=50 die after 1500;
write output to nc1:"rttest/failure_delete-rtree.adm";
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/delete.aql b/asterix-app/src/test/resources/runtimets/queries/failure/delete.aql
index cb51030..cd4a922 100644
--- a/asterix-app/src/test/resources/runtimets/queries/failure/delete.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/failure/delete.aql
@@ -22,16 +22,13 @@
l_comment: string
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineItem
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
(("path"="nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
delete $l from dataset LineItem where $l.l_orderkey>=10 die after 1500;
write output to nc1:"rttest/failure_delete.adm";
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql b/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql
index ca4e910..2ec32f4 100644
--- a/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/failure/insert-rtree.aql
@@ -16,10 +16,8 @@
loc: point
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset MyData(MyRecord)
- partitioned by key id on group1;
+ partitioned by key id;
load dataset MyData
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
@@ -27,7 +25,7 @@
create dataset MyMiniData(MyMiniRecord)
- partitioned by key id on group1;
+ partitioned by key id;
load dataset MyMiniData
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/insert.aql b/asterix-app/src/test/resources/runtimets/queries/failure/insert.aql
index 570f4bc..3f1daad 100644
--- a/asterix-app/src/test/resources/runtimets/queries/failure/insert.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/failure/insert.aql
@@ -28,13 +28,11 @@
l_suppkey: int32
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
create dataset LineID(LineIDType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineItem
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql b/asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql
index def6e9a..a0c7f87 100644
--- a/asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/failure/q1_pricing_summary_report_failure.aql
@@ -23,10 +23,8 @@
l_comment: string
}
-create nodegroup group1 if not exists on nc1;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineItem
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/index/orders-index-custkey-conjunctive.aql b/asterix-app/src/test/resources/runtimets/queries/index/orders-index-custkey-conjunctive.aql
index f01b16d..10db179 100644
--- a/asterix-app/src/test/resources/runtimets/queries/index/orders-index-custkey-conjunctive.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/index/orders-index-custkey-conjunctive.aql
@@ -2,7 +2,6 @@
create dataverse tpch;
use dataverse tpch;
-
create type OrderType as closed {
o_orderkey: int32,
o_custkey: int32,
@@ -15,11 +14,8 @@
o_comment: string
}
-
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset Orders(OrderType)
- partitioned by key o_orderkey on group1;
+ partitioned by key o_orderkey;
load dataset Orders
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/index/orders-index-custkey.aql b/asterix-app/src/test/resources/runtimets/queries/index/orders-index-custkey.aql
index 7bc7320..38bc76c 100644
--- a/asterix-app/src/test/resources/runtimets/queries/index/orders-index-custkey.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/index/orders-index-custkey.aql
@@ -2,7 +2,6 @@
create dataverse tpch;
use dataverse tpch;
-
create type OrderType as closed {
o_orderkey: int32,
o_custkey: int32,
@@ -15,11 +14,8 @@
o_comment: string
}
-
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset Orders(OrderType)
- partitioned by key o_orderkey on group1;
+ partitioned by key o_orderkey;
load dataset Orders
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/index/range-search.aql b/asterix-app/src/test/resources/runtimets/queries/index/range-search.aql
index ea0b4ef..666dc73 100644
--- a/asterix-app/src/test/resources/runtimets/queries/index/range-search.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/index/range-search.aql
@@ -22,10 +22,8 @@
l_comment: string
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset LineItem(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ partitioned by key l_orderkey, l_linenumber;
load dataset LineItem
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/index/rtree-secondary-index.aql b/asterix-app/src/test/resources/runtimets/queries/index/rtree-secondary-index.aql
index 71c5630..6dab809 100644
--- a/asterix-app/src/test/resources/runtimets/queries/index/rtree-secondary-index.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/index/rtree-secondary-index.aql
@@ -13,10 +13,8 @@
rec: rectangle
}
-create nodegroup group1 if not exists on nc1, nc2;
-
create dataset MyData(MyRecord)
- partitioned by key id on group1;
+ partitioned by key id;
load dataset MyData
using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
diff --git a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-13.aql b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-13.aql
index 68d0b70..379e282 100644
--- a/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-13.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/open-closed/open-closed-13.aql
@@ -14,9 +14,7 @@
name: string
}
-create nodegroup grouptest on nc1;
-
-create dataset testds(testtype) partitioned by key id on grouptest;
+create dataset testds(testtype) partitioned by key id;
insert into dataset testds (
{ "id": "001", "name": "Person Three", "hobbies": {{"scuba", "music"}}}