http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ast
deleted file mode 100644
index a2fb376..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ast
+++ /dev/null
@@ -1,9 +0,0 @@
-DataverseUse TinySocial
-DatasetDecl FacebookUsers(FacebookUserType) partitioned by [[id]]
-DatasetDecl FacebookMessages(FacebookMessageType) partitioned by [[message-id]]
-DatasetDecl TwitterUsers(TwitterUserType) partitioned by [[screen-name]]
-DatasetDecl TweetMessages(TweetMessageType) partitioned by [[tweetid]]
-DatasetDecl FacebookUsersAlternate(FacebookUserAlternateType) partitioned by 
[[id]]
-DatasetDecl FacebookMessagesAlternate(FacebookMessageAlternateType) 
partitioned by [[message-id]]
-DatasetDecl TwitterUsersAlternate(TwitterUserAlternateType) partitioned by 
[[screen-name]]
-DatasetDecl TweetMessagesAlternate(TweetMessageAlternateType) partitioned by 
[[tweetid]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.ast
deleted file mode 100644
index f36d0ea..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse TinySocial

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
deleted file mode 100644
index 7a8360b..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
+++ /dev/null
@@ -1,21 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$user ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$user ]
-]
-Where
-  OperatorExpr [
-    FieldAccessor [
-      Variable [ Name=$user ]
-      Field=id
-    ]
-    =
-    LiteralExpr [LONG] [8]
-  ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
deleted file mode 100644
index 6e1bdec..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=id
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
deleted file mode 100644
index 525a799..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=message-id
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
deleted file mode 100644
index 593fbfa..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TwitterUsersAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=screen-name
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
deleted file mode 100644
index d375a57..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=tweetid
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
deleted file mode 100644
index 19427c1..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
+++ /dev/null
@@ -1,71 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [field-name]
-    :
-    Variable [ Name=$n ]
-  )
-  (
-    LiteralExpr [STRING] [field-type]
-    :
-    Variable [ Name=$t ]
-  )
-  (
-    LiteralExpr [STRING] [count]
-    :
-    Variable [ Name=$count ]
-  )
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-,
-  FunctionCall TinySocial.get-record-fields@1[
-    Variable [ Name=$r ]
-  ]
-  AS Variable [ Name=$f ]
-]
-Groupby
-  Variable [ Name=$n ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-name
-  ]
-  Variable [ Name=$t ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-type
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    r:=Variable [ Name=$r ]
-    f:=Variable [ Name=$f ]
-  )
-
-Let Variable [ Name=$count ]
-  :=
-  FunctionCall TinySocial.sql-count@1[
-    (
-      SELECT ELEMENT [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=r
-      ]
-      ]
-      FROM [        Variable [ Name=#1 ]
-        AS Variable [ Name=#2 ]
-      ]
-    )
-  ]
-Orderby
-  Variable [ Name=$n ]
-  ASC
-  Variable [ Name=$t ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ast
deleted file mode 100644
index 27cf253..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ast
+++ /dev/null
@@ -1,92 +0,0 @@
-DataverseUse TinySocial
-TypeDecl TwitterUserType [
-  open RecordType {
-    screen-name : string,
-    lang : string,
-    friends_count : bigint,
-    statuses_count : bigint
-  }
-]
-TypeDecl TweetMessageType [
-  closed RecordType {
-    tweetid : string,
-    user : TwitterUserType,
-    sender-location : point?,
-    send-time : datetime,
-    referred-topics : UnorderedList <string>
-,
-    message-text : string
-  }
-]
-TypeDecl EmploymentType [
-  open RecordType {
-    organization-name : string,
-    start-date : date,
-    end-date : date?
-  }
-]
-TypeDecl FacebookUserType [
-  closed RecordType {
-    id : bigint,
-    alias : string,
-    name : string,
-    user-since : datetime,
-    friend-ids : UnorderedList <bigint>
-,
-    employment : OrderedList [EmploymentType]
-
-  }
-]
-TypeDecl FacebookMessageType [
-  closed RecordType {
-    message-id : bigint,
-    author-id : bigint,
-    in-response-to : bigint?,
-    sender-location : point?,
-    message : string
-  }
-]
-TypeDecl TwitterUserAlternateType [
-  open RecordType {
-    screen-name : string,
-    lang : string,
-    friends_count : bigint,
-    statuses_count : bigint
-  }
-]
-TypeDecl TweetMessageAlternateType [
-  closed RecordType {
-    tweetid : string,
-    sender-location : point?,
-    send-time : datetime,
-    referred-topics : UnorderedList <string>
-,
-    message-text : string
-  }
-]
-TypeDecl EmploymentAlternateType [
-  open RecordType {
-    organization-name : string,
-    start-date : date,
-    end-date : date?
-  }
-]
-TypeDecl FacebookUserAlternateType [
-  closed RecordType {
-    id : bigint,
-    alias : string,
-    name : string,
-    friend-ids : UnorderedList <bigint>
-,
-    user-since : datetime
-  }
-]
-TypeDecl FacebookMessageAlternateType [
-  closed RecordType {
-    message-id : bigint,
-    author-id : bigint,
-    in-response-to : bigint?,
-    sender-location : point?,
-    message : string
-  }
-]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ast
deleted file mode 100644
index a2fb376..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ast
+++ /dev/null
@@ -1,9 +0,0 @@
-DataverseUse TinySocial
-DatasetDecl FacebookUsers(FacebookUserType) partitioned by [[id]]
-DatasetDecl FacebookMessages(FacebookMessageType) partitioned by [[message-id]]
-DatasetDecl TwitterUsers(TwitterUserType) partitioned by [[screen-name]]
-DatasetDecl TweetMessages(TweetMessageType) partitioned by [[tweetid]]
-DatasetDecl FacebookUsersAlternate(FacebookUserAlternateType) partitioned by 
[[id]]
-DatasetDecl FacebookMessagesAlternate(FacebookMessageAlternateType) 
partitioned by [[message-id]]
-DatasetDecl TwitterUsersAlternate(TwitterUserAlternateType) partitioned by 
[[screen-name]]
-DatasetDecl TweetMessagesAlternate(TweetMessageAlternateType) partitioned by 
[[tweetid]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.ast
deleted file mode 100644
index f36d0ea..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse TinySocial

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
deleted file mode 100644
index 7a8360b..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
+++ /dev/null
@@ -1,21 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$user ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$user ]
-]
-Where
-  OperatorExpr [
-    FieldAccessor [
-      Variable [ Name=$user ]
-      Field=id
-    ]
-    =
-    LiteralExpr [LONG] [8]
-  ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
deleted file mode 100644
index 6e1bdec..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=id
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
deleted file mode 100644
index 525a799..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=message-id
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
deleted file mode 100644
index 593fbfa..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TwitterUsersAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=screen-name
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
deleted file mode 100644
index d375a57..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=tweetid
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
deleted file mode 100644
index 19427c1..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
+++ /dev/null
@@ -1,71 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [field-name]
-    :
-    Variable [ Name=$n ]
-  )
-  (
-    LiteralExpr [STRING] [field-type]
-    :
-    Variable [ Name=$t ]
-  )
-  (
-    LiteralExpr [STRING] [count]
-    :
-    Variable [ Name=$count ]
-  )
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-,
-  FunctionCall TinySocial.get-record-fields@1[
-    Variable [ Name=$r ]
-  ]
-  AS Variable [ Name=$f ]
-]
-Groupby
-  Variable [ Name=$n ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-name
-  ]
-  Variable [ Name=$t ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-type
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    r:=Variable [ Name=$r ]
-    f:=Variable [ Name=$f ]
-  )
-
-Let Variable [ Name=$count ]
-  :=
-  FunctionCall TinySocial.sql-count@1[
-    (
-      SELECT ELEMENT [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=r
-      ]
-      ]
-      FROM [        Variable [ Name=#1 ]
-        AS Variable [ Name=#2 ]
-      ]
-    )
-  ]
-Orderby
-  Variable [ Name=$n ]
-  ASC
-  Variable [ Name=$t ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ast
deleted file mode 100644
index 04257fc..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ast
+++ /dev/null
@@ -1,90 +0,0 @@
-DataverseUse TinySocial
-TypeDecl TwitterUserType [
-  open RecordType {
-    screen-name : string,
-    lang : string,
-    friends_count : bigint,
-    statuses_count : bigint
-  }
-]
-TypeDecl TweetMessageType [
-  closed RecordType {
-    tweetid : string,
-    user : TwitterUserType,
-    sender-location : point?,
-    send-time : datetime,
-    referred-topics : UnorderedList <string>
-,
-    message-text : string
-  }
-]
-TypeDecl EmploymentType [
-  open RecordType {
-    organization-name : string,
-    start-date : date,
-    end-date : date?
-  }
-]
-TypeDecl FacebookUserType [
-  closed RecordType {
-    id : bigint,
-    alias : string,
-    name : string,
-    user-since : datetime,
-    friend-ids : UnorderedList <bigint>
-,
-    employment : OrderedList [EmploymentType]
-
-  }
-]
-TypeDecl FacebookMessageType [
-  closed RecordType {
-    message-id : bigint,
-    author-id : bigint,
-    in-response-to : bigint?,
-    sender-location : point?,
-    message : string
-  }
-]
-TypeDecl TwitterUserAlternateType [
-  open RecordType {
-    screen-name : string,
-    lang : string,
-    friends_count : bigint,
-    statuses_count : bigint
-  }
-]
-TypeDecl TweetMessageAlternateType [
-  closed RecordType {
-    tweetid : string,
-    user : TwitterUserAlternateType,
-    sender-location : point?,
-    send-time : datetime,
-    message-text : string
-  }
-]
-TypeDecl EmploymentAlternateType [
-  open RecordType {
-    organization-name : string,
-    start-date : date,
-    end-date : date?
-  }
-]
-TypeDecl FacebookUserAlternateType [
-  closed RecordType {
-    id : bigint,
-    alias : string,
-    name : string,
-    user-since : datetime,
-    employment : EmploymentAlternateType
-  }
-]
-TypeDecl FacebookMessageAlternateType [
-  closed RecordType {
-    message-id : bigint,
-    author-id : bigint,
-    in-response-to : bigint?,
-    sender-location : point?,
-    message : string
-  }
-]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ast
deleted file mode 100644
index a2fb376..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ast
+++ /dev/null
@@ -1,9 +0,0 @@
-DataverseUse TinySocial
-DatasetDecl FacebookUsers(FacebookUserType) partitioned by [[id]]
-DatasetDecl FacebookMessages(FacebookMessageType) partitioned by [[message-id]]
-DatasetDecl TwitterUsers(TwitterUserType) partitioned by [[screen-name]]
-DatasetDecl TweetMessages(TweetMessageType) partitioned by [[tweetid]]
-DatasetDecl FacebookUsersAlternate(FacebookUserAlternateType) partitioned by 
[[id]]
-DatasetDecl FacebookMessagesAlternate(FacebookMessageAlternateType) 
partitioned by [[message-id]]
-DatasetDecl TwitterUsersAlternate(TwitterUserAlternateType) partitioned by 
[[screen-name]]
-DatasetDecl TweetMessagesAlternate(TweetMessageAlternateType) partitioned by 
[[tweetid]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.ast
deleted file mode 100644
index f36d0ea..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse TinySocial

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
deleted file mode 100644
index 7a8360b..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
+++ /dev/null
@@ -1,21 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$user ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$user ]
-]
-Where
-  OperatorExpr [
-    FieldAccessor [
-      Variable [ Name=$user ]
-      Field=id
-    ]
-    =
-    LiteralExpr [LONG] [8]
-  ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
deleted file mode 100644
index 6e1bdec..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=id
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
deleted file mode 100644
index 525a799..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=message-id
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
deleted file mode 100644
index 593fbfa..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TwitterUsersAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=screen-name
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
deleted file mode 100644
index d375a57..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=tweetid
-  ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
deleted file mode 100644
index 19427c1..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
+++ /dev/null
@@ -1,71 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [field-name]
-    :
-    Variable [ Name=$n ]
-  )
-  (
-    LiteralExpr [STRING] [field-type]
-    :
-    Variable [ Name=$t ]
-  )
-  (
-    LiteralExpr [STRING] [count]
-    :
-    Variable [ Name=$count ]
-  )
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-,
-  FunctionCall TinySocial.get-record-fields@1[
-    Variable [ Name=$r ]
-  ]
-  AS Variable [ Name=$f ]
-]
-Groupby
-  Variable [ Name=$n ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-name
-  ]
-  Variable [ Name=$t ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-type
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    r:=Variable [ Name=$r ]
-    f:=Variable [ Name=$f ]
-  )
-
-Let Variable [ Name=$count ]
-  :=
-  FunctionCall TinySocial.sql-count@1[
-    (
-      SELECT ELEMENT [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=r
-      ]
-      ]
-      FROM [        Variable [ Name=#1 ]
-        AS Variable [ Name=#2 ]
-      ]
-    )
-  ]
-Orderby
-  Variable [ Name=$n ]
-  ASC
-  Variable [ Name=$t ]
-  ASC
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ast
deleted file mode 100644
index 74c6095..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ast
+++ /dev/null
@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl opentype [
-  open RecordType {
-    id : integer,
-    fname : string
-  }
-]
-DatasetDecl testds(opentype) partitioned by [[id]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.ast
deleted file mode 100644
index 916a59e..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
deleted file mode 100644
index c165b6f..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
+++ /dev/null
@@ -1,26 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-RecordConstructor [
-  (
-    FieldAccessor [
-      Variable [ Name=$x ]
-      Field=fname
-    ]
-    :
-    LiteralExpr [STRING] [smith]
-  )
-  (
-    FunctionCall test.lowercase@1[
-      LiteralExpr [STRING] [NAME]
-    ]
-    :
-    LiteralExpr [STRING] [john]
-  )
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [testds]
-  ]
-  AS Variable [ Name=$x ]
-]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ast
deleted file mode 100644
index 1d7b726..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ast
+++ /dev/null
@@ -1,8 +0,0 @@
-DataverseUse test
-TypeDecl opentype [
-  open RecordType {
-    fname1 : string,
-    fname2 : string
-  }
-]
-DatasetDecl testds(opentype) partitioned by [[fname1]]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.ast
deleted file mode 100644
index 916a59e..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
deleted file mode 100644
index 0ec5e92..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
+++ /dev/null
@@ -1,27 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-RecordConstructor [
-  (
-    FieldAccessor [
-      Variable [ Name=$x ]
-      Field=fname1
-    ]
-    :
-    LiteralExpr [STRING] [john]
-  )
-  (
-    FieldAccessor [
-      Variable [ Name=$x ]
-      Field=fname2
-    ]
-    :
-    LiteralExpr [STRING] [smith]
-  )
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [testds]
-  ]
-  AS Variable [ Name=$x ]
-]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.1.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.1.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.1.ast
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.2.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.2.ast
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.ast
deleted file mode 100644
index ec19477..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.ast
+++ /dev/null
@@ -1,15 +0,0 @@
-DataverseUse test
-Set import-private-functions=true
-Query:
-SELECT ELEMENT [
-FunctionCall test.open-record-constructor@8[
-  LiteralExpr [STRING] [foo1]
-  LiteralExpr [LONG] [10]
-  LiteralExpr [STRING] [bar1]
-  LiteralExpr [LONG] [20]
-  LiteralExpr [STRING] [foo2]
-  LiteralExpr [LONG] [30]
-  LiteralExpr [STRING] [bar2]
-  LiteralExpr [LONG] [40]
-]
-]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.1.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.1.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.1.ast
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.2.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.2.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.2.ast
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast
deleted file mode 100644
index db26503..0000000
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast
+++ /dev/null
@@ -1,37 +0,0 @@
-DataverseUse test
-Set import-private-functions=true
-Query:
-SELECT ELEMENT [
-FunctionCall test.open-record-constructor@8[
-  LiteralExpr [STRING] [foo1]
-  LiteralExpr [LONG] [10]
-  LiteralExpr [STRING] [bar1]
-  FunctionCall test.closed-record-constructor@12[
-    LiteralExpr [STRING] [bar1.1]
-    LiteralExpr [LONG] [10]
-    LiteralExpr [STRING] [bar1.2]
-    LiteralExpr [LONG] [20]
-    LiteralExpr [STRING] [bar1.3]
-    LiteralExpr [LONG] [30]
-    LiteralExpr [STRING] [bar1.4]
-    FunctionCall test.closed-record-constructor@8[
-      LiteralExpr [STRING] [bar1.4.1]
-      LiteralExpr [LONG] [10]
-      LiteralExpr [STRING] [bar1.4.2]
-      LiteralExpr [LONG] [20]
-      LiteralExpr [STRING] [bar1.4.3]
-      LiteralExpr [LONG] [30]
-      LiteralExpr [STRING] [bar1.4.4]
-      LiteralExpr [LONG] [40]
-    ]
-    LiteralExpr [STRING] [foo2]
-    LiteralExpr [LONG] [30]
-    LiteralExpr [STRING] [bar2]
-    LiteralExpr [LONG] [40]
-  ]
-  LiteralExpr [STRING] [foo2]
-  LiteralExpr [LONG] [30]
-  LiteralExpr [STRING] [bar2]
-  LiteralExpr [LONG] [40]
-]
-]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml 
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
index 7a19102..c5afa97 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -22,7 +22,7 @@
              <!ENTITY APIQueries SYSTEM "queries/api/APIQueries.xml">
              <!ENTITY ComparisonQueries SYSTEM 
"queries/comparison/ComparisonQueries.xml">
              <!ENTITY DeepEqualQueries SYSTEM 
"queries/comparison/deep_equal/DeepEqualQueries.xml">
-             <!ENTITY RecordsQueries SYSTEM 
"queries/records/RecordsQueries.xml">
+             <!ENTITY RecordsQueries SYSTEM 
"queries/objects/ObjectsQueries.xml">
              <!ENTITY TemporalQueries SYSTEM 
"queries/temporal/TemporalQueries.xml">
 
              ]>
@@ -3361,8 +3361,8 @@
         </compilation-unit>
       </test-case>
       <test-case FilePath="open-index-enforced/error-checking">
-        <compilation-unit name="record-type-collision">
-          <output-dir compare="Text">record-type-collision</output-dir>
+        <compilation-unit name="object-type-collision">
+          <output-dir compare="Text">object-type-collision</output-dir>
           
<expected-error>org.apache.asterix.common.exceptions.AsterixException: A field 
"[value]" is already defined with the type "STRING"</expected-error>
         </compilation-unit>
       </test-case>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index ada8989..f89fd63 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -17,7 +17,7 @@
  ! under the License.
  !-->
 <!DOCTYPE test-suite [
-  <!ENTITY RecordsQueries SYSTEM "queries_sqlpp/records/RecordsQueries.xml">
+  <!ENTITY RecordsQueries SYSTEM "queries_sqlpp/objects/ObjectsQueries.xml">
 
 ]>
 <test-suite xmlns="urn:xml.testframework.asterix.apache.org" 
ResultOffsetPath="results" QueryOffsetPath="queries_sqlpp" 
QueryFileExtension=".sqlpp">

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml 
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
index 5fee98c..df7e5a0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
@@ -18,7 +18,7 @@
  !-->
 <!DOCTYPE test-suite [
 
-             <!ENTITY RecordsQueries SYSTEM 
"queries/records/RecordsQueries.xml">
+             <!ENTITY RecordsQueries SYSTEM 
"queries/objects/ObjectsQueries.xml">
 
              ]>
 <test-suite

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-doc/src/main/markdown/builtins/0_toc.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/0_toc.md 
b/asterixdb/asterix-doc/src/main/markdown/builtins/0_toc.md
index 2cab02c..911ee63 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/0_toc.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/0_toc.md
@@ -28,7 +28,7 @@
 * [Similarity Functions](#SimilarityFunctions)
 * [Tokenizing Functions](#TokenizingFunctions)
 * [Temporal Functions](#TemporalFunctions)
-* [Record Functions](#RecordFunctions)
+* [Object Functions](#ObjectFunctions)
 * [Aggregate Functions (Array Functions)](#AggregateFunctions)
 * [Comparison Functions](#ComparisonFunctions)
 * [Type Functions](#TypeFunctions)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md 
b/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
index 7d355b2..7e8a7fe 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
@@ -129,11 +129,11 @@
 
         is_object(expr)
 
- * Checks whether the given expression is evaluated to be a `record` value.
+ * Checks whether the given expression is evaluated to be a `object` value.
  * Arguments:
     * `expr` : an expression (any type is allowed).
  * Return Value:
-    * a `boolean` on whether the argument is a `record` value or not,
+    * a `boolean` on whether the argument is a `object` value or not,
     * a `missing` if the argument is a `missing` value,
     * a `null` if the argument is a `null` value.
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md 
b/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
index ee5ca31..b28443c 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
@@ -151,7 +151,7 @@
         deep_equal(expr1, expr2)
 
 
- * Assess the equality between two expressions of any type (e.g., record, 
arrays, or multiset).
+ * Assess the equality between two expressions of any type (e.g., object, 
arrays, or multiset).
  Two objects are deeply equal iff both their types and values are equal.
  * Arguments:
     * `expr1` : an expression,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-doc/src/main/markdown/builtins/8_record.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/8_record.md 
b/asterixdb/asterix-doc/src/main/markdown/builtins/8_record.md
index a110433..d7ec35b 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/8_record.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/8_record.md
@@ -17,27 +17,27 @@
  ! under the License.
  !-->
 
-## <a id="RecordFunctions">Record Functions</a> ##
+## <a id="ObjectFunctions">Object Functions</a> ##
 
-### get_record_fields ###
+### get_object_fields ###
  * Syntax:
 
-        get_record_fields(input_record)
+        get_object_fields(input_object)
 
- * Access the record field names, type and open status for a given record.
+ * Access the object field names, type and open status for a given object.
  * Arguments:
-    * `input_record` : a record value.
+    * `input_object` : a object value.
  * Return Value:
-    * an array of `record` values that include the field_name `string`,
+    * an array of `object` values that include the field_name `string`,
       field_type `string`, is_open `boolean` (used for debug purposes only: 
`true` if field is open and `false` otherwise),
-      and optional nested `orderedList` for the values of a nested record,
+      and optional nested `orderedList` for the values of a nested object,
     * `missing` if the argument is a `missing` value,
     * `null` if the argument is a `null` value,
-    * any other non-record input value will cause a type error.
+    * any other non-object input value will cause a type error.
 
  * Example:
 
-        get_record_fields(
+        get_object_fields(
                           {
                             "id": 1,
                             "project": "AsterixDB",
@@ -70,26 +70,26 @@
         ]
 
  ]
-### get_record_field_value ###
+### get_object_field_value ###
  * Syntax:
 
-        get_record_field_value(input_record, string)
+        get_object_field_value(input_object, string)
 
- * Access the field name given in the `string_expression` from the 
`record_expression`.
+ * Access the field name given in the `string_expression` from the 
`object_expression`.
  * Arguments:
-    * `input_record` : a `record` value.
+    * `input_object` : a `object` value.
     * `string` : a `string` representing the top level field name.
  * Return Value:
-    * an `any` value saved in the designated field of the record,
+    * an `any` value saved in the designated field of the object,
     * `missing` if any argument is a `missing` value,
     * `null` if any argument is a `null` value but no argument is a `missing` 
value,
     * a type error will be raised if:
-        * the first argument is any other non-record value,
+        * the first argument is any other non-object value,
         * or, the second argument is any other non-string value.
 
  * Example:
 
-        get_record_field_value({
+        get_object_field_value({
                                  "id": 1,
                                  "project": "AsterixDB",
                                  "address": {"city": "Irvine", "state": "CA"},
@@ -102,28 +102,28 @@
 
         "AsterixDB"
 
-### record_remove_fields ###
+### object_remove_fields ###
  * Syntax:
 
-        record_remove_fields(input_record, field_names)
+        object_remove_fields(input_object, field_names)
 
- * Remove indicated fields from a record given a list of field names.
+ * Remove indicated fields from a object given a list of field names.
  * Arguments:
-    * `input_record`:  a record value.
+    * `input_object`:  a object value.
     * `field_names`: an array of strings and/or array of array of strings.
 
  * Return Value:
-    * a new record value without the fields listed in the second argument,
+    * a new object value without the fields listed in the second argument,
     * `missing` if any argument is a `missing` value,
     * `null` if any argument is a `null` value but no argument is a `missing` 
value,
     * a type error will be raised if:
-        * the first argument is any other non-record value,
+        * the first argument is any other non-object value,
         * or, the second argument is any other non-array value or recursively 
contains non-string items.
 
 
  * Example:
 
-        record_remove_fields(
+        object_remove_fields(
                                {
                                  "id":1,
                                  "project":"AsterixDB",
@@ -141,27 +141,27 @@
           "address":{ "state": "CA" }
         }
 
-### record_add_fields ###
+### object_add_fields ###
  * Syntax:
 
-        record_add_fields(input_record, fields)
+        object_add_fields(input_object, fields)
 
- * Add fields to a record given a list of field names.
+ * Add fields to a object given a list of field names.
  * Arguments:
-    * `input_record` : a record value.
-    * `fields`: an array of field descriptor records where each record has 
field_name and  field_value.
+    * `input_object` : a object value.
+    * `fields`: an array of field descriptor objects where each object has 
field_name and  field_value.
  * Return Value:
-    * a new record value with the new fields included,
+    * a new object value with the new fields included,
     * `missing` if any argument is a `missing` value,
     * `null` if any argument is a `null` value but no argument is a `missing` 
value,
     * a type error will be raised if:
-        * the first argument is any other non-record value,
-        * the second argument is any other non-array value, or contains 
non-record items.
+        * the first argument is any other non-object value,
+        * the second argument is any other non-array value, or contains 
non-object items.
 
 
  * Example:
 
-        record_add_fields(
+        object_add_fields(
                            {
                              "id":1,
                              "project":"AsterixDB",
@@ -181,26 +181,26 @@
            "employment_location": point("30.0,70.0")
          }
 
-### record_merge ###
+### object_merge ###
  * Syntax:
 
-        record_merge(record1, record2)
+        object_merge(object1, object2)
 
- * Merge two different records into a new record.
+ * Merge two different objects into a new object.
  * Arguments:
-    * `record1` : a record value.
-    * `record2` : a record value.
+    * `object1` : a object value.
+    * `object2` : a object value.
  * Return Value:
-    * a new record value with fields from both input records. If a field’s 
names in both records are the same,
+    * a new object value with fields from both input objects. If a field’s 
names in both objects are the same,
       an exception is issued,
     * `missing` if any argument is a `missing` value,
     * `null` if any argument is a `null` value but no argument is a `missing` 
value,
-    * any other non-record input value will cause a type error.
+    * any other non-object input value will cause a type error.
 
 
  * Example:
 
-        record_merge(
+        object_merge(
                       {
                         "id":1,
                         "project":"AsterixDB",

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/10351a74/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md 
b/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md
index 811094e..17cf9bf 100644
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md
@@ -33,7 +33,7 @@ SQL++ is a highly composable expression language. Each SQL++ 
expression returns
 
 The most basic building block for any SQL++ expression is PrimaryExpression. 
This can be a simple literal (constant)
 value, a reference to a query variable that is in scope, a parenthesized 
expression, a function call, or a newly
-constructed instance of the data model (such as a newly constructed record, 
array, or multiset of data model instances).
+constructed instance of the data model (such as a newly constructed object, 
array, or multiset of data model instances).
 
 ### <a id="Literals">Literals</a>
 
@@ -58,7 +58,7 @@ constructed instance of the data model (such as a newly 
constructed record, arra
                      | <DIGITS> ( "." <DIGITS> )?
                      | "." <DIGITS>
 
-Literals (constants) in SQL++ can be strings, integers, floating point values, 
double values, boolean constants, or special constant values like `NULL` and 
`MISSING`. The `NULL` value is like a `NULL` in SQL; it is used to represent an 
unknown field value. The specialy value `MISSING` is only meaningful in the 
context of SQL++ field accesses; it occurs when the accessed field simply does 
not exist at all in a record being accessed.
+Literals (constants) in SQL++ can be strings, integers, floating point values, 
double values, boolean constants, or special constant values like `NULL` and 
`MISSING`. The `NULL` value is like a `NULL` in SQL; it is used to represent an 
unknown field value. The specialy value `MISSING` is only meaningful in the 
context of SQL++ field accesses; it occurs when the accessed field simply does 
not exist at all in a object being accessed.
 
 The following are some simple examples of SQL++ literals.
 
@@ -115,20 +115,20 @@ The following example is a (built-in) function call 
expression whose value is 8.
     CollectionConstructor    ::= ArrayConstructor | MultisetConstructor
     ArrayConstructor         ::= "[" ( Expression ( "," Expression )* )? "]"
     MultisetConstructor      ::= "{{" ( Expression ( "," Expression )* )? "}}"
-    RecordConstructor        ::= "{" ( FieldBinding ( "," FieldBinding )* )? 
"}"
+    ObjectConstructor        ::= "{" ( FieldBinding ( "," FieldBinding )* )? 
"}"
     FieldBinding             ::= Expression ":" Expression
 
 A major feature of SQL++ is its ability to construct new data model instances. 
This is accomplished using its constructors
-for each of the model's complex object structures, namely arrays, multisets, 
and records.
+for each of the model's complex object structures, namely arrays, multisets, 
and objects.
 Arrays are like JSON arrays, while multisets have bag semantics.
-Records are built from fields that are field-name/field-value pairs, again 
like JSON.
+Objects are built from fields that are field-name/field-value pairs, again 
like JSON.
 (See the [data model document](../datamodel.html) for more details on each.)
 
-The following examples illustrate how to construct a new array with 3 items, a 
new record with 2 fields,
+The following examples illustrate how to construct a new array with 3 items, a 
new object with 2 fields,
 and a new multiset with 4 items, respectively. Array elements or multiset 
elements can be homogeneous (as in
 the first example),
 which is the common case, or they may be heterogeneous (as in the third 
example). The data values and field name values
-used to construct arrays, multisets, and records in constructors are all 
simply SQL++ expressions. Thus, the collection elements,
+used to construct arrays, multisets, and objects in constructors are all 
simply SQL++ expressions. Thus, the collection elements,
 field names, and field values used in constructors can be simple literals or 
they can come from query variable references
 or even arbitrarily complex SQL++ expressions (subqueries).
 
@@ -150,12 +150,12 @@ or even arbitrarily complex SQL++ expressions 
(subqueries).
     Index           ::= "[" ( Expression | "?" ) "]"
 
 Components of complex types in the data model are accessed via path 
expressions. Path access can be applied to the result
-of a SQL++ expression that yields an instance of  a complex type, e.g., a 
record or array instance. For records,
+of a SQL++ expression that yields an instance of  a complex type, e.g., a 
object or array instance. For objects,
 path access is based on field names. For arrays, path access is based on 
(zero-based) array-style indexing.
 SQL++ also supports an "I'm feeling lucky" style index accessor, [?], for 
selecting an arbitrary element from an array.
  Attempts to access non-existent fields or out-of-bound array elements produce 
the special value `MISSING`.
 
-The following examples illustrate field access for a record, index-based 
element access for an array, and also a
+The following examples illustrate field access for a object, index-based 
element access for an array, and also a
 composition thereof.
 
 ##### Examples
@@ -220,7 +220,7 @@ Collection operators are used for membership tests (IN, NOT 
IN) or empty collect
 | NOT EXISTS |  Check whether a collection is empty         | SELECT * FROM 
ChirpMessages cm <br/>WHERE NOT EXISTS cm.referredTopics; |
 
 ### <a id="Comparison_operators">Comparison operators</a>
-Comparison operators are used to compare values. The comparison operators fall 
into one of two sub-categories: missing value comparisons and regular value 
comparisons. SQL++ (and JSON) has two ways of representing missing information 
in a record - the presence of the field with a NULL for its value (as in SQL), 
and the absence of the field (which JSON permits). For example, the first of 
the following records represents Jack, whose friend is Jill. In the other 
examples, Jake is friendless a la SQL, with a friend field that is NULL, while 
Joe is friendless in a more natural (for JSON) way, i.e., by not having a 
friend field.
+Comparison operators are used to compare values. The comparison operators fall 
into one of two sub-categories: missing value comparisons and regular value 
comparisons. SQL++ (and JSON) has two ways of representing missing information 
in a object - the presence of the field with a NULL for its value (as in SQL), 
and the absence of the field (which JSON permits). For example, the first of 
the following objects represents Jack, whose friend is Jill. In the other 
examples, Jake is friendless a la SQL, with a friend field that is NULL, while 
Joe is friendless in a more natural (for JSON) way, i.e., by not having a 
friend field.
 
 ##### Examples
 {"name": "Jack", "friend": "Jill"}

Reply via email to