Fix for issue 252 and 253
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_issue_252_253@1182 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1.aql
index f7bad20..de0e870 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_1.aql
@@ -17,7 +17,7 @@
write output to nc1:"mdtest/basic_issue_251_dataset_hint_1.adm";
create dataset Book(LineType)
-partitioned by key id
+primary key id
hints( cardinality = 2000);
for $x in dataset('Metadata.Dataset')
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2.aql
index 9377ea5..27d2c2c 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_2.aql
@@ -17,7 +17,7 @@
write output to nc1:"mdtest/basic_issue_251_dataset_hint_2.adm";
create dataset Book(LineType)
-partitioned by key id
+primary key id
hints(cardinality=2000);
for $x in dataset('Metadata.Dataset')
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3.aql
index 15f45a7..b6a730f 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_3.aql
@@ -17,7 +17,7 @@
write output to nc1:"mdtest/basic_issue_251_dataset_hint_3.adm";
create dataset Book(LineType)
-partitioned by key id
+primary key id
hints(CARDINALITY=2000);
for $x in dataset('Metadata.Dataset')
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4.aql b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4.aql
index c5d30e5..af7077a 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/issue_251_dataset_hint_4.aql
@@ -17,7 +17,7 @@
write output to nc1:"mdtest/basic_issue_251_dataset_hint_4.adm";
create dataset Book(LineType)
-partitioned by key id;
+primary key id;
for $x in dataset('Metadata.Dataset')
where $x.DataverseName='test'
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta02.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta02.aql
index 8bfc240..7778e99 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta02.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta02.aql
@@ -13,7 +13,7 @@
id : int32
}
-create dataset testdv.dst01(testtype) partitioned by key id;
+create dataset testdv.dst01(testtype) primary key id;
for $l in dataset('Metadata.Dataset')
where $l.DataverseName = 'testdv' and $l.DatasetName = 'dst01'
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta05.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta05.aql
index 9eb129d..201ab6e 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta05.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta05.aql
@@ -14,7 +14,7 @@
name : string
}
-create dataset testdv.t1(testtype) partitioned by key id;
+create dataset testdv.t1(testtype) primary key id;
create index idx1 on testdv.t1(name);
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta09.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta09.aql
index 28a3794..56c6c7a 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta09.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta09.aql
@@ -13,7 +13,7 @@
id:int32
}
-create dataset test.t1(testtype) partitioned by key id;
+create dataset test.t1(testtype) primary key id;
insert into dataset test.t1({"id":123});
insert into dataset test.t1({"id":133});
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta11.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta11.aql
index d781114..0e02802 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta11.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta11.aql
@@ -13,7 +13,7 @@
id : int32
}
-create dataset test.dst01(testtype) partitioned by key id;
+create dataset test.dst01(testtype) primary key id;
drop dataset test.dst01;
diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta12.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta12.aql
index 1de7ac5..82e2eb0 100644
--- a/asterix-app/src/test/resources/metadata/queries/basic/meta12.aql
+++ b/asterix-app/src/test/resources/metadata/queries/basic/meta12.aql
@@ -14,7 +14,7 @@
name : string
}
-create dataset test.dst01(testtype) partitioned by key id;
+create dataset test.dst01(testtype) primary key id;
create index idx1 on test.dst01(name);
diff --git a/asterix-app/src/test/resources/metadata/queries/exception/issue_251_dataset_hint_error_1.aql b/asterix-app/src/test/resources/metadata/queries/exception/issue_251_dataset_hint_error_1.aql
index 9f849e3..eb3f3dc 100644
--- a/asterix-app/src/test/resources/metadata/queries/exception/issue_251_dataset_hint_error_1.aql
+++ b/asterix-app/src/test/resources/metadata/queries/exception/issue_251_dataset_hint_error_1.aql
@@ -15,5 +15,5 @@
}
create dataset Book(LineType)
-partitioned by key id
+primary key id
hints(size=2000,tuple_size=100);
diff --git a/asterix-app/src/test/resources/metadata/queries/exception/issue_251_dataset_hint_error_2.aql b/asterix-app/src/test/resources/metadata/queries/exception/issue_251_dataset_hint_error_2.aql
index 459b7f6..830370e 100644
--- a/asterix-app/src/test/resources/metadata/queries/exception/issue_251_dataset_hint_error_2.aql
+++ b/asterix-app/src/test/resources/metadata/queries/exception/issue_251_dataset_hint_error_2.aql
@@ -16,7 +16,7 @@
}
create dataset Book(LineType)
-partitioned by key id
+primary key id
hints(cardinality="-20jh0",size=45);
for $x in dataset('Metadata.Dataset')
diff --git a/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql b/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
index d4678f2..19b87a2 100644
--- a/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
+++ b/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
@@ -37,7 +37,7 @@
create nodegroup group1 if not exists on nc1, nc2;
create dataset Customers(CustomerType)
- partitioned by key cid, name on group1;
+ primary key cid, name on group1;
create nodegroup group1 on nc1, nc2;