You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by dl...@apache.org on 2018/02/22 04:03:42 UTC

[7/8] asterixdb git commit: [ASTERIXDB-2287][SQL] Support SELECT variable.* in SQL++

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/error-checking/record-type-collision/record-collision.1.ddl.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/error-checking/record-type-collision/record-collision.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/error-checking/record-type-collision/record-collision.1.ddl.aql
deleted file mode 100644
index 1c88a1c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/error-checking/record-type-collision/record-collision.1.ddl.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type testType as open {
-   "id": int32,
-   "value": string
-}
-
-create dataset testDS(testType) primary key id;
-create index testIdx on testDS(value: int32?) enforced;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries/temporal/TemporalQueries.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temporal/TemporalQueries.xml b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temporal/TemporalQueries.xml
index 94030df..ab9a76b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temporal/TemporalQueries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temporal/TemporalQueries.xml
@@ -18,11 +18,16 @@
             </compilation-unit>
         </test-case>
         <test-case FilePath="temporal">
-            <compilation-unit name="agg_01">
-                <output-dir compare="Text">agg_01</output-dir>
+            <compilation-unit name="agg_min">
+                <output-dir compare="Text">agg_min</output-dir>
             </compilation-unit>
         </test-case>
         <test-case FilePath="temporal">
+          <compilation-unit name="agg_max">
+            <output-dir compare="Text">agg_max</output-dir>
+          </compilation-unit>
+        </test-case>
+        <test-case FilePath="temporal">
             <compilation-unit name="overlap_bins_gby_1">
                 <output-dir compare="Text">overlap_bins_gby_1</output-dir>
             </compilation-unit>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-but-different-order.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-but-different-order.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-but-different-order.1.ddl.sqlpp
deleted file mode 100644
index 1194907..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-but-different-order.1.ddl.sqlpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description     : Test creating an index with the same keys as primary keys but in different order
- * Expected Result : Success
- * Date            : Aug 3 2017
- */
-
-drop  dataverse test if exists;
-create  dataverse test;
-
-use test;
-
-
-create type test.testType as
-{
-  id : integer,
-  `value` : string
-}
-
-create  dataset testDS(testType) primary key id, `value`;
-
-create  index testIdx  on testDS (`value`, id);
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-but-different-order/keys-same-as-pk-but-different-order.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-but-different-order/keys-same-as-pk-but-different-order.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-but-different-order/keys-same-as-pk-but-different-order.1.ddl.sqlpp
new file mode 100644
index 0000000..797aff5
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-but-different-order/keys-same-as-pk-but-different-order.1.ddl.sqlpp
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description     : Test creating an index with the same keys as primary keys but in different order
+ * Expected Result : Success
+ * Date            : Aug 3 2017
+ */
+
+drop  dataverse test if exists;
+create  dataverse test;
+
+use test;
+
+
+create type test.testType as
+{
+  id : integer,
+  `value` : string
+};
+
+create  dataset testDS(testType) primary key id, `value`;
+
+create  index testIdx  on testDS (`value`, id);
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-in-same-order.2.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-in-same-order.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-in-same-order.2.ddl.sqlpp
deleted file mode 100644
index f0e387c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-in-same-order.2.ddl.sqlpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description     : Test creating an index with the same keys as primary keys in same order
- * Expected Result : Success
- * Date            : Aug 3 2017
- */
-
-drop  dataverse test if exists;
-create  dataverse test;
-
-use test;
-
-
-create type test.testType as
-{
-  id : integer,
-  `value` : string
-}
-
-create  dataset testDS(testType) primary key id, `value`;
-
-create  index testIdx  on testDS (id, `value`);
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-in-same-order/keys-same-as-pk-in-same-order.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-in-same-order/keys-same-as-pk-in-same-order.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-in-same-order/keys-same-as-pk-in-same-order.1.ddl.sqlpp
new file mode 100644
index 0000000..76ca700
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/keys-same-as-pk-in-same-order/keys-same-as-pk-in-same-order.1.ddl.sqlpp
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description     : Test creating an index with the same keys as primary keys in same order
+ * Expected Result : Success
+ * Date            : Aug 3 2017
+ */
+
+drop  dataverse test if exists;
+create  dataverse test;
+
+use test;
+
+
+create type test.testType as
+{
+  id : integer,
+  `value` : string
+};
+
+create  dataset testDS(testType) primary key id, `value`;
+
+create  index testIdx  on testDS (id, `value`);
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/repetitive-keys.3.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/repetitive-keys.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/repetitive-keys.3.ddl.sqlpp
deleted file mode 100644
index fb7310e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/repetitive-keys.3.ddl.sqlpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description     : Test creating an index with the same key repeated
- * Expected Result : Failure
- * Date            : Aug 3 2017
- */
-
-drop  dataverse test if exists;
-create  dataverse test;
-
-use test;
-
-
-create type test.testType as
-{
-  id : integer,
-  `value` : string
-}
-
-create  dataset testDS(testType) primary key id;
-
-create  index testIdx  on testDS (`value`,`value`);
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/repetitive-keys/repetitive-keys.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/repetitive-keys/repetitive-keys.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/repetitive-keys/repetitive-keys.1.ddl.sqlpp
new file mode 100644
index 0000000..a1978c9
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index/validations/repetitive-keys/repetitive-keys.1.ddl.sqlpp
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description     : Test creating an index with the same key repeated
+ * Expected Result : Failure
+ * Date            : Aug 3 2017
+ */
+
+drop  dataverse test if exists;
+create  dataverse test;
+
+use test;
+
+
+create type test.testType as
+{
+  id : integer,
+  `value` : string
+};
+
+create  dataset testDS(testType) primary key id;
+
+create  index testIdx  on testDS (`value`,`value`);
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
index 9e4b71b..81ec4c1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
@@ -24,11 +24,11 @@ load  dataset DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp
 
 insert into test.DBLP
 select element {'nested':x}
-from  `test.DBLPtmp` as x
+from  test.DBLPtmp as x
 where (x.id <= 50)
 ;
 insert into test.DBLP
 select element {'nested':{'id':c.id,'dblpid':c.dblpid,'authors':c.authors,'misc':c.misc}}
-from  `test.DBLPtmp` as c
+from  test.DBLPtmp as c
 where (c.id > 50)
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml
index aedcab5..c5ff15b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml
@@ -16,125 +16,130 @@
  ! specific language governing permissions and limitations
  ! under the License.
  !-->
-<test-group name="records">
-  <test-case FilePath="records">
+<test-group name="objects">
+  <test-case FilePath="objects">
     <compilation-unit name="access-nested-fields">
       <output-dir compare="Text">access-nested-fields</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="closed-object-constructor_01">
       <output-dir compare="Text">closed-object-constructor_01</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="closed-object-constructor_02">
       <output-dir compare="Text">closed-object-constructor_02</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="closed-object-constructor_03">
       <output-dir compare="Text">closed-object-constructor_03</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="expFieldName">
       <output-dir compare="Text">expFieldName</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="field-access-by-index_01">
       <output-dir compare="Text">field-access-by-index_01</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="field-access-on-open-field">
       <output-dir compare="Text">field-access-on-open-field</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-object-fields">
+  <test-case FilePath="objects/get-object-fields">
     <compilation-unit name="documentation-example">
       <output-dir compare="Text">documentation-example</output-dir>
     </compilation-unit>
   </test-case>
-  <!--test-case FilePath="records/get-object-fields">
+  <!--test-case FilePath="objects/get-object-fields">
       <compilation-unit name="tiny-social-example">
           <output-dir compare="Text">tiny-social-example</output-dir>
       </compilation-unit>
   </test-case!-->
-  <test-case FilePath="records/get-object-fields">
+  <test-case FilePath="objects/get-object-fields">
     <compilation-unit name="tiny-social-example-no-complex-types">
       <output-dir compare="Text">tiny-social-example-no-complex-types</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-object-fields">
+  <test-case FilePath="objects/get-object-fields">
     <compilation-unit name="tiny-social-example-only-lists">
       <output-dir compare="Text">tiny-social-example-only-lists</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-object-fields">
+  <test-case FilePath="objects/get-object-fields">
     <compilation-unit name="tiny-social-example-only-records">
       <output-dir compare="Text">tiny-social-example-only-records</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-object-field-value">
+  <test-case FilePath="objects/get-object-field-value">
     <compilation-unit name="documentation-example">
       <output-dir compare="Text">documentation-example</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-object-field-value">
+  <test-case FilePath="objects/get-object-field-value">
     <compilation-unit name="highly-nested-closed">
       <output-dir compare="Text">highly-nested-closed</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-object-field-value">
+  <test-case FilePath="objects/get-object-field-value">
     <compilation-unit name="highly-nested-mixed">
       <output-dir compare="Text">highly-nested-mixed</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-object-field-value">
+  <test-case FilePath="objects/get-object-field-value">
     <compilation-unit name="highly-nested-open">
       <output-dir compare="Text">highly-nested-open</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-object-field-value">
+  <test-case FilePath="objects/get-object-field-value">
     <compilation-unit name="tiny-social-example">
       <output-dir compare="Text">tiny-social-example</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
+    <compilation-unit name="object_concat">
+      <output-dir compare="Text">object_concat</output-dir>
+    </compilation-unit>
+  </test-case>
+  <test-case FilePath="objects">
     <compilation-unit name="object_pairs">
       <output-dir compare="Text">object_pairs</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="object_pairs-2">
       <output-dir compare="Text">object_pairs-2</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="open-object-constructor_01">
       <output-dir compare="Text">open-object-constructor_01</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="open-object-constructor_02">
       <output-dir compare="Text">open-object-constructor_02</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="closed-closed-fieldname-conflict_issue173">
       <output-dir compare="Text">closed-closed-fieldname-conflict_issue173</output-dir>
       <expected-error>Closed fields 0 and 1 have the same field name "name"</expected-error>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="open-closed-fieldname-conflict_issue173">
       <output-dir compare="Text">open-closed-fieldname-conflict_issue173</output-dir>
       <expected-error>Open field "name" has the same field name as closed field at index 0</expected-error>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records">
+  <test-case FilePath="objects">
     <compilation-unit name="open-open-fieldname-conflict_issue173">
       <output-dir compare="Text">open-open-fieldname-conflict_issue173</output-dir>
       <expected-error>Open fields 0 and 1 have the same field name "name"</expected-error>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp
index 53fb211..a4b1019 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp
@@ -29,6 +29,6 @@ select element result
 from  TweetMessages as r,
       TinySocial.`get-object-fields`(r) as f
 with  result as TinySocial.`get-object-field-value`(r,f.`field-name`)
-where (f.`field-type` = 'STRING')
+where (f.`field-type` = 'string')
 order by result
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_concat/object_concat.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_concat/object_concat.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_concat/object_concat.1.query.sqlpp
new file mode 100644
index 0000000..33ac56b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_concat/object_concat.1.query.sqlpp
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+SELECT VALUE
+[
+  is_null(object_concat()),
+  is_null(object_concat(null)),
+  is_missing(object_concat(missing)),
+  is_null(object_concat({"a":1}, null)),
+  is_missing(object_concat({"a":1}, null, missing)),
+  is_null(object_concat({"a":1}, 1)),
+  is_null(object_concat({"a":1}, [])),
+  object_concat({"a":1, "b":"x"}),
+  object_concat({"a":1, "b":"x" }, {"c":true, "d":false}, {"e":null} ),
+  object_concat({"a":1, "b":"x", "c":true }, {"a":2, "b":"y" }, {"b":null}),
+  object_concat({"a":1, "b": { "x":2, "y":3 } }, {"a":10, "b": { "x":4, "y":5 } }, {"a":100})
+]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/from/from.4.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/from/from.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/from/from.4.query.sqlpp
new file mode 100644
index 0000000..48d4bb2
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/from/from.4.query.sqlpp
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* With LET clause */
+
+USE tpch;
+
+SELECT *
+FROM  Customer c,
+      Orders o,
+      LineItem l
+LET   c_custkey = c.c_custkey,
+      o_orderkey = o.o_orderkey
+WHERE c.c_mktsegment = 'BUILDING' AND c_custkey = o.o_custkey
+      AND l.l_orderkey = o_orderkey AND o.o_orderdate < '1995-03-15'
+      AND l.l_shipdate > '1995-03-15'
+ORDER BY l.l_linenumber, l.l_orderkey
+LIMIT 3;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/group_by/group_by.4.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/group_by/group_by.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/group_by/group_by.4.query.sqlpp
new file mode 100644
index 0000000..99dc304
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/group_by/group_by.4.query.sqlpp
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* With LET clause */
+
+USE tpch;
+
+SELECT *
+FROM  Regions_group_no_agg AS r
+GROUP BY r_name AS name
+LET len = length(name)
+ORDER BY name
+;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/mixed/mixed.4.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/mixed/mixed.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/mixed/mixed.4.query.sqlpp
new file mode 100644
index 0000000..2783b2e
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/mixed/mixed.4.query.sqlpp
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE tpch;
+
+
+SELECT  c.c_custkey, *, o.o_orderkey, l.*
+FROM  Customer c,
+      Orders o,
+      LineItem l
+WHERE c.c_mktsegment = 'BUILDING' AND c.c_custkey = o.o_custkey
+      AND l.l_orderkey = o.o_orderkey AND o.o_orderdate < '1995-03-15'
+      AND l.l_shipdate > '1995-03-15'
+ORDER BY l.l_linenumber, l.l_orderkey
+LIMIT 3;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.1.ddl.sqlpp
new file mode 100644
index 0000000..d5390be
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.1.ddl.sqlpp
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+drop  dataverse tpch if exists;
+create  dataverse tpch;
+
+use tpch;
+
+
+create type tpch.LineItemType as
+ closed {
+  l_orderkey : bigint,
+  l_partkey : bigint,
+  l_suppkey : bigint,
+  l_linenumber : bigint,
+  l_quantity : bigint,
+  l_extendedprice : double,
+  l_discount : double,
+  l_tax : double,
+  l_returnflag : string,
+  l_linestatus : string,
+  l_shipdate : string,
+  l_commitdate : string,
+  l_receiptdate : string,
+  l_shipinstruct : string,
+  l_shipmode : string,
+  l_comment : string
+};
+
+create type tpch.OrderType as
+ closed {
+  o_orderkey : bigint,
+  o_custkey : bigint,
+  o_orderstatus : string,
+  o_totalprice : double,
+  o_orderdate : string,
+  o_orderpriority : string,
+  o_clerk : string,
+  o_shippriority : bigint,
+  o_comment : string
+};
+
+create type tpch.CustomerType as
+ closed {
+  c_custkey : bigint,
+  c_name : string,
+  c_address : string,
+  c_nationkey : bigint,
+  c_phone : string,
+  c_acctbal : double,
+  c_mktsegment : string,
+  c_comment : string
+};
+
+create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+
+create  dataset Orders(OrderType) primary key o_orderkey;
+
+create  dataset Customer(CustomerType) primary key c_custkey;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.2.update.sqlpp
new file mode 100644
index 0000000..69ac8a3
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.2.update.sqlpp
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+use tpch;
+
+
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+
+load  dataset Customer using localfs ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.3.query.sqlpp
new file mode 100644
index 0000000..9c09c26
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.3.query.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE tpch;
+
+SELECT c.*
+FROM  Customer c,
+      Orders o,
+      LineItem l
+WHERE c.c_mktsegment = 'BUILDING' AND c.c_custkey = o.o_custkey
+      AND l.l_orderkey = o.o_orderkey AND o.o_orderdate < '1995-03-15'
+      AND l.l_shipdate > '1995-03-15'
+ORDER BY l.l_linenumber, l.l_orderkey
+LIMIT 3;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.4.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.4.query.sqlpp
new file mode 100644
index 0000000..77370ba
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star/var_star.4.query.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE tpch;
+
+SELECT c.*, o.*, l.*
+FROM  Customer c,
+      Orders o,
+      LineItem l
+WHERE c.c_mktsegment = 'BUILDING' AND c.c_custkey = o.o_custkey
+      AND l.l_orderkey = o.o_orderkey AND o.o_orderdate < '1995-03-15'
+      AND l.l_shipdate > '1995-03-15'
+ORDER BY l.l_linenumber, l.l_orderkey
+LIMIT 3;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star_2/var_star_2.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star_2/var_star_2.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star_2/var_star_2.1.query.sqlpp
new file mode 100644
index 0000000..3598c13
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/var_star_2/var_star_2.1.query.sqlpp
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Description  : Invalid data type in select var.*
+ * Expected Res : Failure
+ */
+
+ SELECT t, t.*
+ FROM [1, 2, 3] t

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.1.ddl.sqlpp
deleted file mode 100644
index 4174a77..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.1.ddl.sqlpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop  dataverse TinySocial if exists;
-create  dataverse TinySocial;
-
-use TinySocial;
-
-
-create type TinySocial.FacebookUserType as
-{
-  id : bigint
-};
-
-create type TinySocial.FacebookMessageType as
-{
-  `message-id` : bigint
-};
-
-create  dataset FacebookUsers(FacebookUserType) primary key id;
-
-create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.2.update.sqlpp
deleted file mode 100644
index ccd33a5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.2.update.sqlpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-use TinySocial;
-
-
-load  dataset FacebookUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/fbu.adm`),(`format`=`adm`));
-
-load  dataset FacebookMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/fbm.adm`),(`format`=`adm`));
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.3.query.sqlpp
deleted file mode 100644
index b527e71..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_order_by_5/union_orderby_5.3.query.sqlpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-USE TinySocial;
-
-SELECT t.id id
-FROM FacebookUsers AS t
-UNION ALL
-SELECT s.`message-id` id
-FROM FacebookMessages AS s
-UNION ALL
-SELECT t.name id
-FROM FacebookUsers AS t
-ORDER BY t.id, id; // There is certainly no field called "t" in the union all results.

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.1.ddl.sqlpp
new file mode 100644
index 0000000..4174a77
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.1.ddl.sqlpp
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+drop  dataverse TinySocial if exists;
+create  dataverse TinySocial;
+
+use TinySocial;
+
+
+create type TinySocial.FacebookUserType as
+{
+  id : bigint
+};
+
+create type TinySocial.FacebookMessageType as
+{
+  `message-id` : bigint
+};
+
+create  dataset FacebookUsers(FacebookUserType) primary key id;
+
+create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.2.update.sqlpp
new file mode 100644
index 0000000..ccd33a5
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.2.update.sqlpp
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+use TinySocial;
+
+
+load  dataset FacebookUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/fbu.adm`),(`format`=`adm`));
+
+load  dataset FacebookMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/fbm.adm`),(`format`=`adm`));
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.3.query.sqlpp
new file mode 100644
index 0000000..b527e71
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_5/union_orderby_5.3.query.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE TinySocial;
+
+SELECT t.id id
+FROM FacebookUsers AS t
+UNION ALL
+SELECT s.`message-id` id
+FROM FacebookMessages AS s
+UNION ALL
+SELECT t.name id
+FROM FacebookUsers AS t
+ORDER BY t.id, id; // There is certainly no field called "t" in the union all results.

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-nullable-fields_issue1616/closed-nullable-fields_issue1616.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-nullable-fields_issue1616/closed-nullable-fields_issue1616.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-nullable-fields_issue1616/closed-nullable-fields_issue1616.1.adm
index 0e46817..75e2f79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-nullable-fields_issue1616/closed-nullable-fields_issue1616.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-nullable-fields_issue1616/closed-nullable-fields_issue1616.1.adm
@@ -1,2 +1,2 @@
-{ "id": "0000000", "created_at": "string", "source": "string", "retweet_count": 1, "retweeted": true, "filter_level": "string", "is_quote_status": true, "id_str": "string", "favorite_count": 1, "text": "string", "lang": "string", "favorited": true, "truncated": true, "timestamp_ms": "string", "entities": { "user_mentions": [ { "indices": [ 1 ], "screen_name": "string", "id_str": "string", "name": "string", "id": 1 } ], "urls": [ { "display_url": "string", "indices": [ 1 ], "expanded_url": "string", "url": "string" } ] }, "user": { "friends_count": 1, "profile_image_url_https": "string", "listed_count": 1, "profile_background_image_url": "string", "default_profile_image": true, "favourites_count": 1, "description": "string", "created_at": "string", "is_translator": true, "profile_background_image_url_https": "string", "protected": true, "screen_name": "string", "id_str": "string", "profile_link_color": "string", "id": 1, "geo_enabled": true, "profile_background_color": "string", "lan
 g": "string", "profile_sidebar_border_color": "string", "profile_text_color": "string", "verified": true, "profile_image_url": "string", "contributors_enabled": true, "profile_background_tile": true, "profile_banner_url": "string", "statuses_count": 1, "followers_count": 1, "profile_use_background_image": true, "default_profile": true, "name": "string", "location": "string", "profile_sidebar_fill_color": "string", "utc_offset": 1, "time_zone": "string", "url": "string" }, "in_reply_to_status_id_str": "string", "in_reply_to_status_id": 1, "in_reply_to_user_id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_user_id": 1, "possibly_sensitive": true, "quoted_status": { "created_at": "string", "truncated": true, "source": "string", "retweet_count": 1, "retweeted": true, "filter_level": "string", "is_quote_status": true, "id_str": "string", "favorite_count": 1, "id": 1, "text": "string", "lang": "string", "user": { "friends_count": 1, "profile_image_url_https": "string", 
 "listed_count": 1, "profile_background_image_url": "string", "default_profile_image": true, "favourites_count": 1, "description": "string", "created_at": "string", "is_translator": true, "profile_background_image_url_https": "string", "protected": true, "screen_name": "string", "id_str": "string", "profile_link_color": "string", "id": 1, "geo_enabled": true, "profile_background_color": "string", "lang": "string", "profile_sidebar_border_color": "string", "profile_text_color": "string", "verified": true, "profile_image_url": "string", "contributors_enabled": true, "profile_background_tile": true, "profile_banner_url": "string", "statuses_count": 1, "followers_count": 1, "profile_use_background_image": true, "default_profile": true, "name": "string", "profile_sidebar_fill_color": "string" }, "favorited": true, "entities": { , "user_mentions": [ { "indices": [ 1 ], "screen_name": "string", "id_str": "string", "name": "string", "id": 1 } ] }, "in_reply_to_status_id_str": "string", "in_r
 eply_to_status_id": 1, "in_reply_to_user_id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_user_id": 1 }, "quoted_status_id": 1, "quoted_status_id_str": "string", "place": { "country_code": "string", "country": "string", "full_name": "string", "bounding_box": { "coordinates": [ [ [ 1.1 ] ] ], "type": "string" }, "place_type": "string", "name": "string", "id": "string", "url": "string" }, "geo": { "coordinates": [ 1.1 ], "type": "string" }, "coordinates": { "coordinates": [ 1.1 ], "type": "string" } }
-{ "id": "11111111111111111111", "created_at": "string", "source": "string", "retweet_count": 1, "retweeted": true, "filter_level": "string", "is_quote_status": true, "id_str": "string", "favorite_count": 1, "text": "string", "lang": "string", "favorited": true, "truncated": true, "timestamp_ms": "string", "user": { "friends_count": 1, "profile_image_url_https": "string", "listed_count": 1, "profile_background_image_url": "string", "default_profile_image": true, "favourites_count": 1, "description": "string", "created_at": "string", "is_translator": true, "profile_background_image_url_https": "string", "protected": true, "screen_name": "string", "id_str": "string", "profile_link_color": "string", "id": 1, "geo_enabled": true, "profile_background_color": "string", "lang": "string", "profile_sidebar_border_color": "string", "profile_text_color": "string", "verified": true, "profile_image_url": "string", "contributors_enabled": true, "profile_background_tile": true, "profile_banner_url"
 : "string", "statuses_count": 1, "followers_count": 1, "profile_use_background_image": true, "default_profile": true, "name": "string", "location": "string", "profile_sidebar_fill_color": "string", "utc_offset": 1, "time_zone": "string", "url": "string" }, "in_reply_to_status_id_str": "string", "in_reply_to_status_id": 1, "in_reply_to_user_id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_user_id": 1, "possibly_sensitive": true, "quoted_status": { "created_at": "string", "truncated": true, "source": "string", "retweet_count": 1, "retweeted": true, "filter_level": "string", "is_quote_status": true, "id_str": "string", "favorite_count": 1, "id": 1, "text": "string", "lang": "string", "user": { "friends_count": 1, "profile_image_url_https": "string", "listed_count": 1, "profile_background_image_url": "string", "default_profile_image": true, "favourites_count": 1, "description": "string", "created_at": "string", "is_translator": true, "profile_background_image_url_htt
 ps": "string", "protected": true, "screen_name": "string", "id_str": "string", "profile_link_color": "string", "id": 1, "geo_enabled": true, "profile_background_color": "string", "lang": "string", "profile_sidebar_border_color": "string", "profile_text_color": "string", "verified": true, "profile_image_url": "string", "contributors_enabled": true, "profile_background_tile": true, "profile_banner_url": "string", "statuses_count": 1, "followers_count": 1, "profile_use_background_image": true, "default_profile": true, "name": "string", "profile_sidebar_fill_color": "string" }, "favorited": true, "entities": { , "user_mentions": [ { "indices": [ 1 ], "screen_name": "string", "id_str": "string", "name": "string", "id": 1 } ] }, "in_reply_to_status_id_str": "string", "in_reply_to_status_id": 1, "in_reply_to_user_id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_user_id": 1 }, "quoted_status_id": 1, "quoted_status_id_str": "string", "place": { "country_code": "string", "
 country": "string", "full_name": "string", "bounding_box": { "coordinates": [ [ [ 1.1 ] ] ], "type": "string" }, "place_type": "string", "name": "string", "id": "string", "url": "string" }, "geo": { "coordinates": [ 1.1 ], "type": "string" }, "coordinates": { "coordinates": [ 1.1 ], "type": "string" } }
+{ "id": "0000000", "created_at": "string", "source": "string", "retweet_count": 1, "retweeted": true, "filter_level": "string", "is_quote_status": true, "id_str": "string", "favorite_count": 1, "text": "string", "lang": "string", "favorited": true, "truncated": true, "timestamp_ms": "string", "entities": { "user_mentions": [ { "indices": [ 1 ], "screen_name": "string", "id_str": "string", "name": "string", "id": 1 } ], "urls": [ { "display_url": "string", "indices": [ 1 ], "expanded_url": "string", "url": "string" } ] }, "user": { "friends_count": 1, "profile_image_url_https": "string", "listed_count": 1, "profile_background_image_url": "string", "default_profile_image": true, "favourites_count": 1, "description": "string", "created_at": "string", "is_translator": true, "profile_background_image_url_https": "string", "protected": true, "screen_name": "string", "id_str": "string", "profile_link_color": "string", "id": 1, "geo_enabled": true, "profile_background_color": "string", "lan
 g": "string", "profile_sidebar_border_color": "string", "profile_text_color": "string", "verified": true, "profile_image_url": "string", "contributors_enabled": true, "profile_background_tile": true, "profile_banner_url": "string", "statuses_count": 1, "followers_count": 1, "profile_use_background_image": true, "default_profile": true, "name": "string", "location": "string", "profile_sidebar_fill_color": "string", "utc_offset": 1, "time_zone": "string", "url": "string" }, "in_reply_to_status_id_str": "string", "in_reply_to_status_id": 1, "in_reply_to_user_id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_user_id": 1, "possibly_sensitive": true, "quoted_status": { "created_at": "string", "truncated": true, "source": "string", "retweet_count": 1, "retweeted": true, "filter_level": "string", "is_quote_status": true, "id_str": "string", "favorite_count": 1, "id": 1, "text": "string", "lang": "string", "user": { "friends_count": 1, "profile_image_url_https": "string", 
 "listed_count": 1, "profile_background_image_url": "string", "default_profile_image": true, "favourites_count": 1, "description": "string", "created_at": "string", "is_translator": true, "profile_background_image_url_https": "string", "protected": true, "screen_name": "string", "id_str": "string", "profile_link_color": "string", "id": 1, "geo_enabled": true, "profile_background_color": "string", "lang": "string", "profile_sidebar_border_color": "string", "profile_text_color": "string", "verified": true, "profile_image_url": "string", "contributors_enabled": true, "profile_background_tile": true, "profile_banner_url": "string", "statuses_count": 1, "followers_count": 1, "profile_use_background_image": true, "default_profile": true, "name": "string", "profile_sidebar_fill_color": "string" }, "favorited": true, "entities": { "user_mentions": [ { "indices": [ 1 ], "screen_name": "string", "id_str": "string", "name": "string", "id": 1 } ] }, "in_reply_to_status_id_str": "string", "in_rep
 ly_to_status_id": 1, "in_reply_to_user_id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_user_id": 1 }, "quoted_status_id": 1, "quoted_status_id_str": "string", "place": { "country_code": "string", "country": "string", "full_name": "string", "bounding_box": { "coordinates": [ [ [ 1.1 ] ] ], "type": "string" }, "place_type": "string", "name": "string", "id": "string", "url": "string" }, "geo": { "coordinates": [ 1.1 ], "type": "string" }, "coordinates": { "coordinates": [ 1.1 ], "type": "string" } }
+{ "id": "11111111111111111111", "created_at": "string", "source": "string", "retweet_count": 1, "retweeted": true, "filter_level": "string", "is_quote_status": true, "id_str": "string", "favorite_count": 1, "text": "string", "lang": "string", "favorited": true, "truncated": true, "timestamp_ms": "string", "user": { "friends_count": 1, "profile_image_url_https": "string", "listed_count": 1, "profile_background_image_url": "string", "default_profile_image": true, "favourites_count": 1, "description": "string", "created_at": "string", "is_translator": true, "profile_background_image_url_https": "string", "protected": true, "screen_name": "string", "id_str": "string", "profile_link_color": "string", "id": 1, "geo_enabled": true, "profile_background_color": "string", "lang": "string", "profile_sidebar_border_color": "string", "profile_text_color": "string", "verified": true, "profile_image_url": "string", "contributors_enabled": true, "profile_background_tile": true, "profile_banner_url"
 : "string", "statuses_count": 1, "followers_count": 1, "profile_use_background_image": true, "default_profile": true, "name": "string", "location": "string", "profile_sidebar_fill_color": "string", "utc_offset": 1, "time_zone": "string", "url": "string" }, "in_reply_to_status_id_str": "string", "in_reply_to_status_id": 1, "in_reply_to_user_id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_user_id": 1, "possibly_sensitive": true, "quoted_status": { "created_at": "string", "truncated": true, "source": "string", "retweet_count": 1, "retweeted": true, "filter_level": "string", "is_quote_status": true, "id_str": "string", "favorite_count": 1, "id": 1, "text": "string", "lang": "string", "user": { "friends_count": 1, "profile_image_url_https": "string", "listed_count": 1, "profile_background_image_url": "string", "default_profile_image": true, "favourites_count": 1, "description": "string", "created_at": "string", "is_translator": true, "profile_background_image_url_htt
 ps": "string", "protected": true, "screen_name": "string", "id_str": "string", "profile_link_color": "string", "id": 1, "geo_enabled": true, "profile_background_color": "string", "lang": "string", "profile_sidebar_border_color": "string", "profile_text_color": "string", "verified": true, "profile_image_url": "string", "contributors_enabled": true, "profile_background_tile": true, "profile_banner_url": "string", "statuses_count": 1, "followers_count": 1, "profile_use_background_image": true, "default_profile": true, "name": "string", "profile_sidebar_fill_color": "string" }, "favorited": true, "entities": { "user_mentions": [ { "indices": [ 1 ], "screen_name": "string", "id_str": "string", "name": "string", "id": 1 } ] }, "in_reply_to_status_id_str": "string", "in_reply_to_status_id": 1, "in_reply_to_user_id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_user_id": 1 }, "quoted_status_id": 1, "quoted_status_id_str": "string", "place": { "country_code": "string", "co
 untry": "string", "full_name": "string", "bounding_box": { "coordinates": [ [ [ 1.1 ] ] ], "type": "string" }, "place_type": "string", "name": "string", "id": "string", "url": "string" }, "geo": { "coordinates": [ 1.1 ], "type": "string" }, "coordinates": { "coordinates": [ 1.1 ], "type": "string" } }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/documentation-example/documentation-example.1.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/documentation-example/documentation-example.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/documentation-example/documentation-example.1.adm
index ff54528..6d10266 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/documentation-example/documentation-example.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/documentation-example/documentation-example.1.adm
@@ -1 +1 @@
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "project", "field-type": "STRING", "is-open": false }, { "field-name": "address", "field-type": "RECORD", "is-open": false, "nested": [ { "field-name": "city", "field-type": "STRING", "is-open": false }, { "field-name": "state", "field-type": "STRING", "is-open": false } ] }, { "field-name": "related", "field-type": "ORDEREDLIST", "is-open": false, "list": [ { "field-type": "STRING" }, { "field-type": "STRING" }, { "field-type": "STRING" } ] } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "project", "field-type": "string", "is-open": false }, { "field-name": "address", "field-type": "object", "is-open": false, "nested": [ { "field-name": "city", "field-type": "string", "is-open": false }, { "field-name": "state", "field-type": "string", "is-open": false } ] }, { "field-name": "related", "field-type": "array", "is-open": false, "list": [ { "field-type": "string" }, { "field-type": "string" }, { "field-type": "string" } ] } ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.adm
index 976dbe7..9512dfe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.adm
@@ -1 +1 @@
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5cdaa5d6/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.adm
index c3a95c9..14075bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.adm
@@ -1,10 +1,10 @@
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
-[ { "field-name": "id", "field-type": "INT64", "is-open": false }, { "field-name": "alias", "field-type": "STRING", "is-open": false }, { "field-name": "name", "field-type": "STRING", "is-open": false }, { "field-name": "user-since", "field-type": "DATETIME", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]
+[ { "field-name": "id", "field-type": "bigint", "is-open": false }, { "field-name": "alias", "field-type": "string", "is-open": false }, { "field-name": "name", "field-type": "string", "is-open": false }, { "field-name": "user-since", "field-type": "datetime", "is-open": false } ]