| 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/spatial/local/spatial-drop.aql b/asterix/asterix-app/src/test/resources/spatial/local/spatial-drop.aql index 61d4913..fc881ad 100644 --- a/asterix/asterix-app/src/test/resources/spatial/local/spatial-drop.aql +++ b/asterix/asterix-app/src/test/resources/spatial/local/spatial-drop.aql
@@ -11,6 +11,6 @@ set format "edu.uci.ics.asterix.runtime.formats.nontagged.NonTaggedDataFormat"; declare dataset MyData(MyRecord) - partitioned by key id on group1; + primary key id on group1; drop dataset MyData; \ No newline at end of file
diff --git a/asterix/asterix-app/src/test/resources/spatial/local/spatial-load.aql b/asterix/asterix-app/src/test/resources/spatial/local/spatial-load.aql index 6c135f3..1df33c0 100644 --- a/asterix/asterix-app/src/test/resources/spatial/local/spatial-load.aql +++ b/asterix/asterix-app/src/test/resources/spatial/local/spatial-load.aql
@@ -11,7 +11,7 @@ set format "edu.uci.ics.asterix.runtime.formats.nontagged.NonTaggedDataFormat"; declare dataset MyData(MyRecord) - partitioned by key id on group1; + primary key id on group1; load dataset MyData using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"