Merged asterix_lsm_stabilization upto r1547
git-svn-id: https://asterixdb.googlecode.com/svn/trunk/asterix@1622 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/optimizerts/queries/nested_loj2.aql b/asterix-app/src/test/resources/optimizerts/queries/nested_loj2.aql
index 0b77f55..d235b09 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/nested_loj2.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/nested_loj2.aql
@@ -47,11 +47,11 @@
create nodegroup group1 if not exists on nc1, nc2;
create dataset LineItems(LineItemType)
- partitioned by key l_orderkey, l_linenumber on group1;
+ primary key l_orderkey, l_linenumber on group1;
create dataset Orders(OrderType)
- partitioned by key o_orderkey on group1;
+ primary key o_orderkey on group1;
create dataset Customers(CustomerType)
- partitioned by key c_custkey on group1;
+ primary key c_custkey on group1;
write output to nc1:"/tmp/nested_loj.adm";