Murtadha Hubail has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1956
Change subject: Adapt to New SQL++ Model ...................................................................... Adapt to New SQL++ Model Change-Id: I8959f3ed2cfac508e6b1da6b2e500510d2798bda --- M asterix-bad/src/test/resources/optimizerts/queries/channel/channel-create.sqlpp M asterix-bad/src/test/resources/optimizerts/queries/channel/channel-subscribe.sqlpp M asterix-bad/src/test/resources/optimizerts/queries/channel/channel-unsubscribe.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.3.query.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.4.query.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.8.query.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.5.query.sqlpp M asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure/delete_procedure.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure/insert_procedure.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.1.ddl.sqlpp M asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.2.update.sqlpp M asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.4.update.sqlpp M asterix-bad/src/test/resources/runtimets/queries/procedure/repetitive_insert_procedure/repetitive_insert_procedure.1.ddl.sqlpp 20 files changed, 23 insertions(+), 18 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-bad refs/changes/56/1956/1 diff --git a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-create.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-create.sqlpp index 24d73e2..9192157 100644 --- a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-create.sqlpp +++ b/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-create.sqlpp @@ -34,7 +34,7 @@ message_text: string, countA: int32, countB: int32 -} +}; create dataset TweetMessageuuids(TweetMessageTypeuuid) diff --git a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-subscribe.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-subscribe.sqlpp index 4a5cbbc..5a1832c 100644 --- a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-subscribe.sqlpp +++ b/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-subscribe.sqlpp @@ -34,7 +34,7 @@ message_text: string, countA: int32, countB: int32 -} +}; create dataset TweetMessageuuids(TweetMessageTypeuuid) diff --git a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-unsubscribe.sqlpp b/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-unsubscribe.sqlpp index 508eaa2..c825006 100644 --- a/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-unsubscribe.sqlpp +++ b/asterix-bad/src/test/resources/optimizerts/queries/channel/channel-unsubscribe.sqlpp @@ -34,7 +34,7 @@ message_text: string, countA: int32, countB: int32 -} +}; create dataset TweetMessageuuids(TweetMessageTypeuuid) diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp index 5e1a742..8e20dcb 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_datasets/create_channel_check_datasets.1.ddl.sqlpp @@ -35,7 +35,7 @@ message_text: string, countA: int32, countB: int32 -} +}; create dataset TweetMessageuuids(TweetMessageTypeuuid) diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp index 69c3e3e..b85ba91 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/create_channel_check_metadata/create_channel_check_metadata.1.ddl.sqlpp @@ -35,7 +35,7 @@ message_text: string, countA: int32, countB: int32 -} +}; create dataset TweetMessageuuids(TweetMessageTypeuuid) diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp index cd6db81..1c7fdcc 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.1.ddl.sqlpp @@ -35,7 +35,7 @@ message_text: string, countA: int32, countB: int32 -} +}; create dataset TweetMessageuuids(TweetMessageTypeuuid) diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.3.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.3.query.sqlpp index cde68a7..7a1c5a1 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.3.query.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_datasets/drop_channel_check_datasets.3.query.sqlpp @@ -23,3 +23,4 @@ where x.DatasetName = result.SubscriptionsDatasetName or x.DatasetName = result.ResultsDatasetName order by x.DatasetName +; \ No newline at end of file diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp index cd6db81..1c7fdcc 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_channel_check_metadata/drop_channel_check_metadata.1.ddl.sqlpp @@ -35,7 +35,7 @@ message_text: string, countA: int32, countB: int32 -} +}; create dataset TweetMessageuuids(TweetMessageTypeuuid) diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.1.ddl.sqlpp index 9febd43..fe1db99 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.1.ddl.sqlpp @@ -30,16 +30,16 @@ create type userLocation as { userId: int, roomNumber: int -} +}; create type watchedUser as { userId: int, name: string -} +}; create type roomSecurity as { roomNumber: int, securityGuardName: string, securityGuardNumber: string -} +}; create dataset watchedUsers(watchedUser) primary key userId; diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.4.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.4.query.sqlpp index de8d3e8..8612077 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.4.query.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.4.query.sqlpp @@ -28,3 +28,4 @@ select test.BrokerName, test.param0 from roomRecordsSubscriptions test order by test.BrokerName +; diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.8.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.8.query.sqlpp index 1f9851f..91473b9 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.8.query.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/room_occupants/room_occupants.8.query.sqlpp @@ -28,3 +28,4 @@ select result.result.userId from roomRecordsResults result order by result.result.userId +; \ No newline at end of file diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp index 52942ba..09a74e3 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.1.ddl.sqlpp @@ -35,7 +35,7 @@ message_text: string, countA: int32, countB: int32 -} +}; create dataset TweetMessageuuids(TweetMessageTypeuuid) diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.5.query.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.5.query.sqlpp index ef6a39c..cd0510d 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.5.query.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/subscribe_channel_check_subscriptions/subscribe_channel_check_subscriptions.5.query.sqlpp @@ -20,4 +20,5 @@ select value param1 from nearbyTweetChannelSubscriptions -order by param1 \ No newline at end of file +order by param1 +; \ No newline at end of file diff --git a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp index 8b0b05c..42fd4aa 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/channel/ten_minute_channel/ten_minute_channel.1.ddl.sqlpp @@ -30,7 +30,7 @@ create type userLocation as { userId: int, roomNumber: int -} +}; create dataset UserLocations(userLocation) primary key userId; diff --git a/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure/delete_procedure.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure/delete_procedure.1.ddl.sqlpp index face703..7dbf136 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure/delete_procedure.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure/delete_procedure.1.ddl.sqlpp @@ -30,7 +30,7 @@ create type myLocation as { timeStamp: datetime, roomNumber: int -} +}; create dataset UserLocations(myLocation) diff --git a/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure/insert_procedure.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure/insert_procedure.1.ddl.sqlpp index 783aacb..0d3064b 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure/insert_procedure.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure/insert_procedure.1.ddl.sqlpp @@ -30,7 +30,7 @@ create type myLocation as { timeStamp: datetime, roomNumber: int -} +}; create dataset UserLocations(myLocation) diff --git a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.1.ddl.sqlpp index 8cdfc6a..031531a 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.1.ddl.sqlpp @@ -30,7 +30,7 @@ create type myLocation as { timeStamp: datetime, roomNumber: int -} +}; create dataset UserLocations(myLocation) diff --git a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.2.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.2.update.sqlpp index 28370e9..aaaaf8b 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.2.update.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.2.update.sqlpp @@ -28,3 +28,4 @@ insert into UserLocations([ {"timeStamp":current_datetime(), "roomNumber":222}] ) +; \ No newline at end of file diff --git a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.4.update.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.4.update.sqlpp index ef3184b..9b50f4b 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.4.update.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure/query_procedure.4.update.sqlpp @@ -26,4 +26,4 @@ use channels; insert into UserLocations([ {"timeStamp":current_datetime(), "roomNumber":225}] -) +); diff --git a/asterix-bad/src/test/resources/runtimets/queries/procedure/repetitive_insert_procedure/repetitive_insert_procedure.1.ddl.sqlpp b/asterix-bad/src/test/resources/runtimets/queries/procedure/repetitive_insert_procedure/repetitive_insert_procedure.1.ddl.sqlpp index b89d997..76f7f38 100644 --- a/asterix-bad/src/test/resources/runtimets/queries/procedure/repetitive_insert_procedure/repetitive_insert_procedure.1.ddl.sqlpp +++ b/asterix-bad/src/test/resources/runtimets/queries/procedure/repetitive_insert_procedure/repetitive_insert_procedure.1.ddl.sqlpp @@ -30,7 +30,7 @@ create type myLocation as { timeStamp: datetime, roomNumber: int -} +}; create dataset UserLocations(myLocation) -- To view, visit https://asterix-gerrit.ics.uci.edu/1956 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8959f3ed2cfac508e6b1da6b2e500510d2798bda Gerrit-PatchSet: 1 Gerrit-Project: asterixdb-bad Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail <mhub...@apache.org>