| commit | 68b25e191c81d7a4b46e2ca9228b443bd217efaf | [log] [tgz] |
|---|---|---|
| author | vinayakb <vinayakb@eaa15691-b419-025a-1212-ee371bd00084> | Sat Apr 06 21:21:29 2013 +0000 |
| committer | vinayakb <vinayakb@eaa15691-b419-025a-1212-ee371bd00084> | Sat Apr 06 21:21:29 2013 +0000 |
| tree | fafeb388933f77b73dcbac0f7f2a81bc2f290edd | |
| parent | 4b44580b0ce81a3c933b5320a1481b3e9511a3df [diff] |
Merged asterix_lsm_stabilization upto r1547 git-svn-id: https://asterixdb.googlecode.com/svn/trunk@1622 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix/asterix-app/src/test/resources/dapd/denorm_user_event.aql b/asterix/asterix-app/src/test/resources/dapd/denorm_user_event.aql index a3b9fab..fe79872 100644 --- a/asterix/asterix-app/src/test/resources/dapd/denorm_user_event.aql +++ b/asterix/asterix-app/src/test/resources/dapd/denorm_user_event.aql
@@ -27,8 +27,8 @@ declare nodegroup group1 on nc1, nc2; -declare dataset Users(UserType) partitioned by key u_name on group1; -declare dataset Events(EventType) partitioned by key e_name on group1; +declare dataset Users(UserType) primary key u_name on group1; +declare dataset Events(EventType) primary key e_name on group1; write output to nc1:"/tmp/denorm_user_event.adm";
diff --git a/asterix/asterix-app/src/test/resources/dapd/q1.aql b/asterix/asterix-app/src/test/resources/dapd/q1.aql index ae6b28f..934387b 100644 --- a/asterix/asterix-app/src/test/resources/dapd/q1.aql +++ b/asterix/asterix-app/src/test/resources/dapd/q1.aql
@@ -23,7 +23,7 @@ declare nodegroup group1 on nc1, nc2; -declare dataset User(UserType) partitioned by key name on group1; +declare dataset User(UserType) primary key name on group1; write output to nc1:"/tmp/q1.adm";
diff --git a/asterix/asterix-app/src/test/resources/dapd/q2.aql b/asterix/asterix-app/src/test/resources/dapd/q2.aql index 3998b9e..fdb0469 100644 --- a/asterix/asterix-app/src/test/resources/dapd/q2.aql +++ b/asterix/asterix-app/src/test/resources/dapd/q2.aql
@@ -37,7 +37,7 @@ drop dataset Event; declare dataset Event(EventType) - partitioned by key event_id on group1; + primary key event_id on group1; load dataset Event using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"