Merge branch 'gerrit/trinity' into 'gerrit/goldfish'

Ext-ref: MB-62951,MB-52982,MB-63076,MB-56704

Change-Id: I8113d2c7cf7e3684d0db3ad4d554d9ac42ac41e0
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
index 2602917..35b4866 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
@@ -54,11 +54,11 @@
     private final Stats stats;
     private final ARecordType recordType;
 
-    private boolean indentJSON;
-    private boolean quoteRecord;
+    private final boolean indentJSON;
+    private final boolean quoteRecord;
 
     // Whether we are wrapping the output sequence in an array
-    private boolean wrapArray = false;
+    private final boolean wrapArray;
     // Whether this is the first instance being output
     private boolean notFirst = false;
 
@@ -72,6 +72,7 @@
         this.recordType = recordType;
         this.indentJSON = conf.is(SessionConfig.FORMAT_INDENT_JSON);
         this.quoteRecord = conf.is(SessionConfig.FORMAT_QUOTE_RECORD);
+        this.wrapArray = conf.is(SessionConfig.FORMAT_WRAPPER_ARRAY);
         this.resultDisplayFrameMgr = new FrameManager(appCtx.getCompilerProperties().getFrameSize());
         if (indentJSON) {
             this.om = new ObjectMapper();
@@ -106,7 +107,6 @@
                 notfirst = true;
                 app.append('"').append(name.replace("\"", "\"\"")).append('"');
             }
-            app.append("\r\n");
         } catch (IOException e) {
             throw HyracksDataException.create(e);
         }
@@ -126,9 +126,8 @@
             throw HyracksDataException.create(e);
         }
 
-        if (conf.is(SessionConfig.FORMAT_WRAPPER_ARRAY)) {
+        if (wrapArray) {
             output.out().print("[ ");
-            wrapArray = true;
         }
 
         if (conf.fmt() == SessionConfig.OutputFormat.CSV && conf.is(SessionConfig.FORMAT_CSV_HEADER)) {
@@ -139,11 +138,13 @@
                 StringWriter sw = new StringWriter();
                 appendCSVHeader(sw, recordType);
                 output.out().print(JSONUtil.quoteAndEscape(sw.toString()));
-                output.out().print("\n");
-                notFirst = true;
             } else {
                 appendCSVHeader(output.out(), recordType);
             }
+            if (!wrapArray) {
+                output.out().println();
+            }
+            notFirst = true;
         }
     }
 
@@ -173,10 +174,6 @@
                 record = result;
             }
         }
-        if (conf.fmt() == SessionConfig.OutputFormat.CSV) {
-            // TODO(tillw): this is inefficient as well
-            record = record + "\r\n";
-        }
         if (quoteRecord) {
             // TODO(tillw): this is inefficient as well
             record = JSONUtil.quoteAndEscape(record);
@@ -210,16 +207,15 @@
                 for (int tIndex = 0; tIndex < last; tIndex++) {
                     final int start = fta.getTupleStartOffset(tIndex);
                     int length = fta.getTupleEndOffset(tIndex) - start;
-                    if (conf.fmt() == SessionConfig.OutputFormat.CSV
-                            && ((length > 0) && (frameBytes[start + length - 1] == '\n'))) {
-                        length--;
-                    }
                     String result = new String(frameBytes, start, length, UTF_8);
                     if (wrapArray && notFirst) {
-                        output.out().print(", ");
+                        output.out().print(',');
                     }
                     notFirst = true;
                     displayRecord(result);
+                    if (!wrapArray) {
+                        output.out().println();
+                    }
                 }
                 frameBuffer.clear();
             }
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
index 05b8bbf..ac85052 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
@@ -219,6 +219,7 @@
         }
 
         final boolean isJsonFormat = isJsonFormat(fmt);
+        boolean firstResult = true;
 
         // if we have errors field in the results, we will always return it
         checkForErrors(result);
@@ -235,6 +236,10 @@
             final JsonNode fieldValue = result.get(fieldName);
             switch (fieldKind) {
                 case RESULTS:
+                    if (!firstResult) {
+                        resultBuilder.append('\n');
+                    }
+                    firstResult = false;
                     if (fieldValue.size() <= 1) {
                         if (fieldValue.size() == 0) {
                             resultBuilder.append("");
@@ -257,7 +262,7 @@
                         } else {
                             for (JsonNode f : fields) {
                                 if (f.isValueNode()) {
-                                    resultBuilder.append(f.asText());
+                                    resultBuilder.append(f.asText()).append('\n');
                                 } else {
                                     resultBuilder.append(prettyPrint(f)).append('\n');
                                 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.001.regexjson b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.001.regexjson
index 173a9a5..628e8b0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.001.regexjson
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.001.regexjson
@@ -4,7 +4,7 @@
 		"*": "*"
 	},
 	"type": "application/x-adm",
-	"results": [ "{ \"v\": 1 }\n", "{ \"v\": 2 }\n" ],
+	"results": [ "{ \"v\": 1 }", "{ \"v\": 2 }" ],
 	"plans": "R{.*}",
 	"status": "success",
 	"metrics": {
@@ -13,7 +13,7 @@
 		"compileTime": "R{.*}",
 		"queueWaitTime": "R{.*}",
 		"resultCount": 2,
-		"resultSize": 32,
+		"resultSize": "R{.*}",
 		"processedObjects": 0
 	}
 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson
index 9dcdbb6..7c4f553 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson
@@ -4,7 +4,7 @@
 		"*": "*"
 	},
 	"type": "application/x-adm",
-	"results": [ "{ \"$1\": 17 }\n" ],
+	"results": [ "{ \"$1\": 17 }" ],
 	"plans": "R{.*}",
 	"status": "success",
 	"metrics": {
@@ -13,7 +13,7 @@
 		"compileTime": "R{.*}",
 		"queueWaitTime": "R{.*}",
 		"resultCount": 1,
-		"resultSize": 18,
+		"resultSize": "R{.*}",
 		"processedObjects": 17,
 		"bufferCacheHitRatio": "100.00%",
 		"bufferCachePageReadCount": 1
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/format-param-in-accept-01/format-param-in-accept-01.1.regexjson b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/format-param-in-accept-01/format-param-in-accept-01.1.regexjson
index ad8ba0a..0134449 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/format-param-in-accept-01/format-param-in-accept-01.1.regexjson
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/format-param-in-accept-01/format-param-in-accept-01.1.regexjson
@@ -2,7 +2,7 @@
 	"requestID": "R{[a-zA-Z0-9-]+}",
 	"signature": {"*": "*"},
 	"type": "application/x-adm",
-	"results": [ "{{ \"foo\", \"bar\" }}\n" ],
+	"results": [ "{{ \"foo\", \"bar\" }}" ],
 	"plans":{},
 	"status": "success",
     "metrics": "R{.*}"
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/multiple-param-values/multiple-param-values.1.regexjson b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/multiple-param-values/multiple-param-values.1.regexjson
index 0701ef3..aab9677 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/multiple-param-values/multiple-param-values.1.regexjson
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/multiple-param-values/multiple-param-values.1.regexjson
@@ -4,7 +4,7 @@
 		"*": "*"
 	},
 	"type": "application/x-adm",
-	"results": [ "{ \"$1\": 1 }\n" ]
+	"results": [ "{ \"$1\": 1 }" ]
 	,
 	"plans":{},
 	"status": "success",
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.03.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.03.regexadm
index bd85d0e..5c091b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.03.regexadm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.03.regexadm
@@ -3,21 +3,7 @@
 \s*\Q"signature": {\E
 \s*\Q"*": "*"\E
 \s*\Q},\E
-\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q]\E
+\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E
 \s*\Q,\E
 \s*\Q"plans":{},\E
 \s*\Q"warnings": [{\E\s*
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.04.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.04.regexadm
index dce84fe..a0d6601 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.04.regexadm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.04.regexadm
@@ -3,21 +3,7 @@
 \s*\Q"signature": {\E
 \s*\Q"*": "*"\E
 \s*\Q},\E
-\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q]\E
+\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E
 \s*\Q,\E
 \s*\Q"plans":{},\E
 \s*\Q"status": "success",\E
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.05.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.05.regexadm
index 6b1931a..ac945a7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.05.regexadm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.05.regexadm
@@ -3,21 +3,7 @@
 \s*\Q"signature": {\E
 \s*\Q"*": "*"\E
 \s*\Q},\E
-\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q]\E
+\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E
 \s*\Q,\E
 \s*\Q"plans":{},\E
 \s*\Q"status": "success",\E
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.07.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.07.regexadm
index 6b1931a..ac945a7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.07.regexadm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.07.regexadm
@@ -3,21 +3,7 @@
 \s*\Q"signature": {\E
 \s*\Q"*": "*"\E
 \s*\Q},\E
-\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q]\E
+\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E
 \s*\Q,\E
 \s*\Q"plans":{},\E
 \s*\Q"status": "success",\E
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.08.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.08.regexadm
index bd85d0e..5c091b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.08.regexadm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/warnings/warnings-limit/warnings-limit.08.regexadm
@@ -3,21 +3,7 @@
 \s*\Q"signature": {\E
 \s*\Q"*": "*"\E
 \s*\Q},\E
-\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": false }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q, { "F1": { "a": 1 }, "F2": null }\E
-\s*\Q]\E
+\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E
 \s*\Q,\E
 \s*\Q"plans":{},\E
 \s*\Q"warnings": [{\E\s*
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
index f7e5d91..9485a9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
@@ -7396,6 +7396,11 @@
         <output-dir compare="Text">query-ASTERIXDB-3419</output-dir>
       </compilation-unit>
     </test-case>
+    <test-case FilePath="misc">
+      <compilation-unit name="query-ASTERIXDB-3415">
+        <output-dir compare="Text">query-ASTERIXDB-3415</output-dir>
+      </compilation-unit>
+    </test-case>
   </test-group>
   <test-group name="multipart-dataverse">
     <test-case FilePath="multipart-dataverse">
@@ -14309,7 +14314,7 @@
     <test-case FilePath="meta">
       <compilation-unit name="meta_after_gby">
         <output-dir compare="Text">meta_after_gby</output-dir>
-        <expected-error>Compilation error: Inappropriate use of function 'meta'. For example, after GROUP BY (in line 29, at column 21)</expected-error>
+        <expected-error>Compilation error: No source collection found for META(): collection not supported or cannot reference collection (in line 29, at column 21)</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="meta">
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/000-arrayOfInt.json b/asterixdb/asterix-column/src/test/resources/result/assembler/000-arrayOfInt.json
index 0ef2261..e8743b9 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/000-arrayOfInt.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/000-arrayOfInt.json
@@ -1,10 +1,10 @@
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/001-arrayObject.json b/asterixdb/asterix-column/src/test/resources/result/assembler/001-arrayObject.json
index 8857afc..4bfed37 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/001-arrayObject.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/001-arrayObject.json
@@ -1 +1 @@
-{ "a": [ { "b": 1 }, { "b": 2 }, { "c": 3 } ] }
+{"a":[{"b":1},{"b":2},{"c":3}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/002-arrayObject2.json b/asterixdb/asterix-column/src/test/resources/result/assembler/002-arrayObject2.json
index 9eb300f..656e0b5 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/002-arrayObject2.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/002-arrayObject2.json
@@ -1,4 +1,4 @@
-{ "ommhom": [ { "a": [ { "x": 1, "y": 2 }, { "y": 2 }, { "x": 1 } ], "b": 1, "c": 2, "d": 3 } ] }
-{ "ommhom": [ { "a": [ { "x": 1, "y": 2 }, { "y": 2 }, { "x": 1 } ], "b": 1, "c": 2, "d": 3 } ] }
-{ "ommhom": [ { "a": [ { "x": 1, "y": 2 }, { "y": 2 }, { "x": 1 } ], "b": 1, "c": 2, "d": 3 }, { "f": 3 }, { "k": { "v": { "t": 1 } } }, { "a": [ { "j": 1 } ] } ] }
-{ "ommhom": [ { "xyz": [ { "x": 1, "y": 2 }, { "y": 2 }, { "x": 1 } ] } ] }
+{"ommhom":[{"a":[{"x":1,"y":2},{"y":2},{"x":1}],"b":1,"c":2,"d":3}]}
+{"ommhom":[{"a":[{"x":1,"y":2},{"y":2},{"x":1}],"b":1,"c":2,"d":3}]}
+{"ommhom":[{"a":[{"x":1,"y":2},{"y":2},{"x":1}],"b":1,"c":2,"d":3},{"f":3},{"k":{"v":{"t":1}}},{"a":[{"j":1}]}]}
+{"ommhom":[{"xyz":[{"x":1,"y":2},{"y":2},{"x":1}]}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/003-arrayEmpty.json b/asterixdb/asterix-column/src/test/resources/result/assembler/003-arrayEmpty.json
index 3b8b6cc..77555c0 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/003-arrayEmpty.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/003-arrayEmpty.json
@@ -1,3 +1,3 @@
-{ "a": [ { "b": 1 }, { "b": 2 }, { "c": 3 } ] }
-{ "a": [  ] }
-{ "a": [ { "b": 1 }, { "b": 2 }, { "c": 3 } ] }
\ No newline at end of file
+{"a":[{"b":1},{"b":2},{"c":3}]}
+{"a":[]}
+{"a":[{"b":1},{"b":2},{"c":3}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/100-addFields.json b/asterixdb/asterix-column/src/test/resources/result/assembler/100-addFields.json
index 1ce59bc..fb02498 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/100-addFields.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/100-addFields.json
@@ -1,4 +1,4 @@
-{ "a": 1 }
-{ "a": 1, "b": 2 }
-{ "a": 1, "c": 3 }
-{ "a": 1, "b": 2, "c": 3 }
+{"a":1}
+{"a":1,"b":2}
+{"a":1,"c":3}
+{"a":1,"b":2,"c":3}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/101-nestedAddFields.json b/asterixdb/asterix-column/src/test/resources/result/assembler/101-nestedAddFields.json
index f51e0df..2d796b3 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/101-nestedAddFields.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/101-nestedAddFields.json
@@ -1,4 +1,4 @@
-{ "a": { "b": { "c": 1 } } }
-{ "a": { "b": { "c": 1, "d": 2 }, "x": { "y": 2 } } }
-{ "a": { "b": { "c": 1 }, "x": { "z": 2 } } }
-{ "a": { "b": { "c": 1 } } }
\ No newline at end of file
+{"a":{"b":{"c":1}}}
+{"a":{"b":{"c":1,"d":2},"x":{"y":2}}}
+{"a":{"b":{"c":1},"x":{"z":2}}}
+{"a":{"b":{"c":1}}}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/200-unionPrimitive.json b/asterixdb/asterix-column/src/test/resources/result/assembler/200-unionPrimitive.json
index b8b6d23..6c81ed6 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/200-unionPrimitive.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/200-unionPrimitive.json
@@ -1,4 +1,4 @@
-{ "a": 1.25 }
-{ "a": 1 }
-{ "a": "test" }
-{ "a": 2.25 }
\ No newline at end of file
+{"a":1.25}
+{"a":1}
+{"a":"test"}
+{"a":2.25}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/201-unionPrimitiveObject.json b/asterixdb/asterix-column/src/test/resources/result/assembler/201-unionPrimitiveObject.json
index 249fee0..2555214 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/201-unionPrimitiveObject.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/201-unionPrimitiveObject.json
@@ -1,2 +1,2 @@
-{ "a": 1 }
-{ "a": { "b": 1 } }
+{"a":1}
+{"a":{"b":1}}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/202-unionPrimitiveArray.json b/asterixdb/asterix-column/src/test/resources/result/assembler/202-unionPrimitiveArray.json
index 6624e9b..e474bb4 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/202-unionPrimitiveArray.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/202-unionPrimitiveArray.json
@@ -1,4 +1,4 @@
-{ "a": 1 }
-{ "a": [ { "b": 1 }, { "b": 2 }, { "b": 3 } ] }
-{ "a": 1 }
-{ "a": [ { "b": 1, "c": 10 }, { "b": 2, "c": 11 }, { "b": 3, "c": 12 } ] }
+{"a":1}
+{"a":[{"b":1},{"b":2},{"b":3}]}
+{"a":1}
+{"a":[{"b":1,"c":10},{"b":2,"c":11},{"b":3,"c":12}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/203-unionNestedNested.json b/asterixdb/asterix-column/src/test/resources/result/assembler/203-unionNestedNested.json
index 5130db99..bf706be 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/203-unionNestedNested.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/203-unionNestedNested.json
@@ -1,4 +1,4 @@
-{ "a": { "b": 1 } }
-{ "a": [ { "b": 1 }, { "b": 2 }, { "b": 3 } ] }
-{ "a": { "b": 1 } }
-{ "a": [ { "b": 1, "c": 10 }, { "b": 2, "c": 11 }, { "b": 3, "c": 12 } ] }
+{"a":{"b":1}}
+{"a":[{"b":1},{"b":2},{"b":3}]}
+{"a":{"b":1}}
+{"a":[{"b":1,"c":10},{"b":2,"c":11},{"b":3,"c":12}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/204-unionArrayPrimitiveItems.json b/asterixdb/asterix-column/src/test/resources/result/assembler/204-unionArrayPrimitiveItems.json
index e468ab2..b74f4b1 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/204-unionArrayPrimitiveItems.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/204-unionArrayPrimitiveItems.json
@@ -1,5 +1,5 @@
-{ "a": [ 1 ] }
-{ "a": [ "1" ] }
-{ "a": [ false ] }
-{ "a": [ 1.25 ] }
-{ "a": [ 1, "1", false, 1.25 ] }
+{"a":[1]}
+{"a":["1"]}
+{"a":[false]}
+{"a":[1.25]}
+{"a":[1,"1",false,1.25]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/205-unionArrayPrimitiveObjectItems.json b/asterixdb/asterix-column/src/test/resources/result/assembler/205-unionArrayPrimitiveObjectItems.json
index 869a4e6..33327d2 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/205-unionArrayPrimitiveObjectItems.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/205-unionArrayPrimitiveObjectItems.json
@@ -1,5 +1,5 @@
-{ "a": [ 1 ] }
-{ "a": [ { "a": 1 } ] }
-{ "a": [ false ] }
-{ "a": [ { "b": 1 } ] }
-{ "a": [ 1, { "a": 1 }, false, { "b": 1 }, { "c": 1 } ] }
+{"a":[1]}
+{"a":[{"a":1}]}
+{"a":[false]}
+{"a":[{"b":1}]}
+{"a":[1,{"a":1},false,{"b":1},{"c":1}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/206-unionArrayPrimitiveObjectArrayItems.json b/asterixdb/asterix-column/src/test/resources/result/assembler/206-unionArrayPrimitiveObjectArrayItems.json
index 2a54e7f..557a9e8 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/206-unionArrayPrimitiveObjectArrayItems.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/206-unionArrayPrimitiveObjectArrayItems.json
@@ -1,5 +1,5 @@
-{ "a": [ 1 ] }
-{ "a": [ [ { "a": 1 } ] ] }
-{ "a": [ false ] }
-{ "a": [ { "b": 5 } ] }
-{ "a": [ 1, { "a": 5 }, false, [ { "b": 1 } ], [ { "c": 1 } ] ] }
+{"a":[1]}
+{"a":[[{"a":1}]]}
+{"a":[false]}
+{"a":[{"b":5}]}
+{"a":[1,{"a":5},false,[{"b":1}],[{"c":1}]]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/207-unionArrayNullItems0.json b/asterixdb/asterix-column/src/test/resources/result/assembler/207-unionArrayNullItems0.json
index f8faf4c..e929ee3 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/207-unionArrayNullItems0.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/207-unionArrayNullItems0.json
@@ -1,3 +1,3 @@
-{ "a": [ null ] }
-{ "a": [ 1 ] }
-{ "a": [ "string" ] }
\ No newline at end of file
+{"a":[null]}
+{"a":[1]}
+{"a":["string"]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/208-unionArrayNullItems1.json b/asterixdb/asterix-column/src/test/resources/result/assembler/208-unionArrayNullItems1.json
index eb3fc85..1e8b301 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/208-unionArrayNullItems1.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/208-unionArrayNullItems1.json
@@ -1,3 +1,3 @@
-{ "a": [ 1 ] }
-{ "a": [ null ] }
-{ "a": [ "string" ] }
\ No newline at end of file
+{"a":[1]}
+{"a":[null]}
+{"a":["string"]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/209-unionArrayNullItems2.json b/asterixdb/asterix-column/src/test/resources/result/assembler/209-unionArrayNullItems2.json
index da80268..c07b643 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/209-unionArrayNullItems2.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/209-unionArrayNullItems2.json
@@ -1,3 +1,3 @@
-{ "a": [ 0, "1", null ] }
-{ "a": [ 0, null, "1" ] }
-{ "a": [ null, 0, "1" ] }
\ No newline at end of file
+{"a":[0,"1",null]}
+{"a":[0,null,"1"]}
+{"a":[null,0,"1"]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/210-unionArrayNullItems3.json b/asterixdb/asterix-column/src/test/resources/result/assembler/210-unionArrayNullItems3.json
index 00fd767..8a5848a 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/210-unionArrayNullItems3.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/210-unionArrayNullItems3.json
@@ -1 +1 @@
-{ "a": [ 0, null, "1" ] }
\ No newline at end of file
+{"a":[0,null,"1"]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/301-null-primitive.json b/asterixdb/asterix-column/src/test/resources/result/assembler/301-null-primitive.json
index aeb319a..57232a9 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/301-null-primitive.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/301-null-primitive.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": null }
-{ "a": null }
-{ "a": 1 }
+{"a":null}
+{"a":null}
+{"a":null}
+{"a":1}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/310-null-object0.json b/asterixdb/asterix-column/src/test/resources/result/assembler/310-null-object0.json
index b563190..2379cf0 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/310-null-object0.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/310-null-object0.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": null }
-{ "a": { "b": 1, "c": 5 } }
-{ "a": { "b": null, "c": null } }
+{"a":null}
+{"a":null}
+{"a":{"b":1,"c":5}}
+{"a":{"b":null,"c":null}}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/311-null-object1.json b/asterixdb/asterix-column/src/test/resources/result/assembler/311-null-object1.json
index ee4a6ce..9cd9b35 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/311-null-object1.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/311-null-object1.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": null }
-{ "a": { "b": null, "c": 5 } }
-{ "a": { "b": 1, "c": null } }
+{"a":null}
+{"a":null}
+{"a":{"b":null,"c":5}}
+{"a":{"b":1,"c":null}}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/312-null-object2.json b/asterixdb/asterix-column/src/test/resources/result/assembler/312-null-object2.json
index 0609637..9539007 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/312-null-object2.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/312-null-object2.json
@@ -1,4 +1,4 @@
-{ "a": { "b": 1, "c": null } }
-{ "a": { "b": null, "c": 5 } }
-{ "a": null }
-{ "a": null }
+{"a":{"b":1,"c":null}}
+{"a":{"b":null,"c":5}}
+{"a":null}
+{"a":null}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/313-null-object3.json b/asterixdb/asterix-column/src/test/resources/result/assembler/313-null-object3.json
index 9c54517..1be1683 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/313-null-object3.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/313-null-object3.json
@@ -1,4 +1,4 @@
-{ "a": { "b": null, "c": null } }
-{ "a": { "b": 1, "c": 5 } }
-{ "a": null }
-{ "a": null }
+{"a":{"b":null,"c":null}}
+{"a":{"b":1,"c":5}}
+{"a":null}
+{"a":null}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/320-null-array0.json b/asterixdb/asterix-column/src/test/resources/result/assembler/320-null-array0.json
index e1d6d6f..e4b6ae1 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/320-null-array0.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/320-null-array0.json
@@ -1,4 +1,4 @@
-{ "a": [ null ] }
-{ "a": null }
-{ "a": [ 1 ] }
-{ "a": [ 3, null, 4 ] }
+{"a":[null]}
+{"a":null}
+{"a":[1]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/321-null-array1.json b/asterixdb/asterix-column/src/test/resources/result/assembler/321-null-array1.json
index e1d6d6f..e4b6ae1 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/321-null-array1.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/321-null-array1.json
@@ -1,4 +1,4 @@
-{ "a": [ null ] }
-{ "a": null }
-{ "a": [ 1 ] }
-{ "a": [ 3, null, 4 ] }
+{"a":[null]}
+{"a":null}
+{"a":[1]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/322-null-array2.json b/asterixdb/asterix-column/src/test/resources/result/assembler/322-null-array2.json
index 83f9f0c..8ca1c4f 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/322-null-array2.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/322-null-array2.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": [ null ] }
-{ "a": [ 1 ] }
-{ "a": [ 3, null, 4 ] }
+{"a":null}
+{"a":[null]}
+{"a":[1]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/323-null-array3.json b/asterixdb/asterix-column/src/test/resources/result/assembler/323-null-array3.json
index f53eae0..ecf07bc 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/323-null-array3.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/323-null-array3.json
@@ -1,4 +1,4 @@
-{ "a": [ null, 1, null ] }
-{ "a": [ null ] }
-{ "a": [ null, null ] }
-{ "a": [ 3, null, 4 ] }
+{"a":[null,1,null]}
+{"a":[null]}
+{"a":[null,null]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/324-null-array4.json b/asterixdb/asterix-column/src/test/resources/result/assembler/324-null-array4.json
index d12be57..e94fb68 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/324-null-array4.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/324-null-array4.json
@@ -1,4 +1,4 @@
-{ "a": [ 1 ] }
-{ "a": [ null ] }
-{ "a": [ null, null ] }
-{ "a": [ 3, null, 4 ] }
+{"a":[1]}
+{"a":[null]}
+{"a":[null,null]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/325-null-array5.json b/asterixdb/asterix-column/src/test/resources/result/assembler/325-null-array5.json
index a0d9cbf..4e844d6 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/325-null-array5.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/325-null-array5.json
@@ -1,4 +1,4 @@
-{ "a": [ { "a": 1 } ] }
-{ "a": null }
-{ "a": [ null ] }
-{ "a": [ { "a": null, "b": 2 }, null, { "a": 3, "b": null } ] }
+{"a":[{"a":1}]}
+{"a":null}
+{"a":[null]}
+{"a":[{"a":null,"b":2},null,{"a":3,"b":null}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/326-null-array6.json b/asterixdb/asterix-column/src/test/resources/result/assembler/326-null-array6.json
index 5a37b18..33a810c 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/326-null-array6.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/326-null-array6.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": [ null ] }
-{ "a": [ { "a": 1 } ] }
-{ "a": [ { "a": null, "b": 2 }, null, { "a": 3, "b": null } ] }
+{"a":null}
+{"a":[null]}
+{"a":[{"a":1}]}
+{"a":[{"a":null,"b":2},null,{"a":3,"b":null}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/327-null-array7.json b/asterixdb/asterix-column/src/test/resources/result/assembler/327-null-array7.json
index f305582..d7d8ccd 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/327-null-array7.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/327-null-array7.json
@@ -1,4 +1,4 @@
-{ "a": [ { "b": 2, "c": null }, null, { "b": null, "c": 3 } ] }
-{ "a": null }
-{ "a": [ null ] }
-{ "a": [ { "c": 1 } ] }
+{"a":[{"b":2,"c":null},null,{"b":null,"c":3}]}
+{"a":null}
+{"a":[null]}
+{"a":[{"c":1}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/assembler/900-dummy-tweet.json b/asterixdb/asterix-column/src/test/resources/result/assembler/900-dummy-tweet.json
index 53f2518..9bdde86 100644
--- a/asterixdb/asterix-column/src/test/resources/result/assembler/900-dummy-tweet.json
+++ b/asterixdb/asterix-column/src/test/resources/result/assembler/900-dummy-tweet.json
@@ -1,2 +1,2 @@
-{ "coordinates": { "coordinates": [ 1.1 ], "type": "string" }, "created_at": "string", "entities": { "urls": [ { "display_url": "string", "expanded_url": "string", "indices": [ 1 ], "url": "string" } ], "user_mentions": [ { "id": 1, "id_str": "string", "indices": [ 1 ], "name": "string", "screen_name": "string" } ] }, "favorite_count": 1, "favorited": true, "filter_level": "string", "geo": { "coordinates": [ 1.1 ], "type": "string" }, "id": "0000000", "id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_status_id": 1, "in_reply_to_status_id_str": "string", "in_reply_to_user_id": 1, "in_reply_to_user_id_str": "string", "is_quote_status": true, "lang": "string", "place": { "bounding_box": { "coordinates": [ [ [ 1.1 ] ] ], "type": "string" }, "country": "string", "country_code": "string", "full_name": "string", "id": "string", "name": "string", "place_type": "string", "url": "string" }, "possibly_sensitive": true, "quoted_status": { "created_at": "string", "entities": { "user_mentions": [ { "id": 1, "id_str": "string", "indices": [ 1 ], "name": "string", "screen_name": "string" } ] }, "favorite_count": 1, "favorited": true, "filter_level": "string", "id": 1, "id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_status_id": 1, "in_reply_to_status_id_str": "string", "in_reply_to_user_id": 1, "in_reply_to_user_id_str": "string", "is_quote_status": true, "lang": "string", "retweet_count": 1, "retweeted": true, "source": "string", "text": "string", "truncated": true, "user": { "contributors_enabled": true, "created_at": "string", "default_profile": true, "default_profile_image": true, "description": "string", "favourites_count": 1, "followers_count": 1, "friends_count": 1, "geo_enabled": true, "id": 1, "id_str": "string", "is_translator": true, "lang": "string", "listed_count": 1, "name": "string", "profile_background_color": "string", "profile_background_image_url": "string", "profile_background_image_url_https": "string", "profile_background_tile": true, "profile_banner_url": "string", "profile_image_url": "string", "profile_image_url_https": "string", "profile_link_color": "string", "profile_sidebar_border_color": "string", "profile_sidebar_fill_color": "string", "profile_text_color": "string", "profile_use_background_image": true, "protected": true, "screen_name": "string", "statuses_count": 1, "verified": true } }, "quoted_status_id": 1, "quoted_status_id_str": "string", "retweet_count": 1, "retweeted": true, "source": "string", "text": "string", "timestamp_ms": "string", "truncated": true, "user": { "contributors_enabled": true, "created_at": "string", "default_profile": true, "default_profile_image": true, "description": "string", "favourites_count": 1, "followers_count": 1, "friends_count": 1, "geo_enabled": true, "id": 1, "id_str": "string", "is_translator": true, "lang": "string", "listed_count": 1, "location": "string", "name": "string", "profile_background_color": "string", "profile_background_image_url": "string", "profile_background_image_url_https": "string", "profile_background_tile": true, "profile_banner_url": "string", "profile_image_url": "string", "profile_image_url_https": "string", "profile_link_color": "string", "profile_sidebar_border_color": "string", "profile_sidebar_fill_color": "string", "profile_text_color": "string", "profile_use_background_image": true, "protected": true, "screen_name": "string", "statuses_count": 1, "time_zone": "string", "url": "string", "utc_offset": 1, "verified": true } }
-{ "coordinates": { "coordinates": [ 1.1 ], "type": "string" }, "created_at": "string", "favorite_count": 1, "favorited": true, "filter_level": "string", "geo": { "coordinates": [ 1.1 ], "type": "string" }, "id": "11111111111111111111", "id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_status_id": 1, "in_reply_to_status_id_str": "string", "in_reply_to_user_id": 1, "in_reply_to_user_id_str": "string", "is_quote_status": true, "lang": "string", "place": { "bounding_box": { "coordinates": [ [ [ 1.1 ] ] ], "type": "string" }, "country": "string", "country_code": "string", "full_name": "string", "id": "string", "name": "string", "place_type": "string", "url": "string" }, "possibly_sensitive": true, "quoted_status": { "created_at": "string", "entities": { "user_mentions": [ { "id": 1, "id_str": "string", "indices": [ 1 ], "name": "string", "screen_name": "string" } ] }, "favorite_count": 1, "favorited": true, "filter_level": "string", "id": 1, "id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_status_id": 1, "in_reply_to_status_id_str": "string", "in_reply_to_user_id": 1, "in_reply_to_user_id_str": "string", "is_quote_status": true, "lang": "string", "retweet_count": 1, "retweeted": true, "source": "string", "text": "string", "truncated": true, "user": { "contributors_enabled": true, "created_at": "string", "default_profile": true, "default_profile_image": true, "description": "string", "favourites_count": 1, "followers_count": 1, "friends_count": 1, "geo_enabled": true, "id": 1, "id_str": "string", "is_translator": true, "lang": "string", "listed_count": 1, "name": "string", "profile_background_color": "string", "profile_background_image_url": "string", "profile_background_image_url_https": "string", "profile_background_tile": true, "profile_banner_url": "string", "profile_image_url": "string", "profile_image_url_https": "string", "profile_link_color": "string", "profile_sidebar_border_color": "string", "profile_sidebar_fill_color": "string", "profile_text_color": "string", "profile_use_background_image": true, "protected": true, "screen_name": "string", "statuses_count": 1, "verified": true } }, "quoted_status_id": 1, "quoted_status_id_str": "string", "retweet_count": 1, "retweeted": true, "source": "string", "text": "string", "timestamp_ms": "string", "truncated": true, "user": { "contributors_enabled": true, "created_at": "string", "default_profile": true, "default_profile_image": true, "description": "string", "favourites_count": 1, "followers_count": 1, "friends_count": 1, "geo_enabled": true, "id": 1, "id_str": "string", "is_translator": true, "lang": "string", "listed_count": 1, "location": "string", "name": "string", "profile_background_color": "string", "profile_background_image_url": "string", "profile_background_image_url_https": "string", "profile_background_tile": true, "profile_banner_url": "string", "profile_image_url": "string", "profile_image_url_https": "string", "profile_link_color": "string", "profile_sidebar_border_color": "string", "profile_sidebar_fill_color": "string", "profile_text_color": "string", "profile_use_background_image": true, "protected": true, "screen_name": "string", "statuses_count": 1, "time_zone": "string", "url": "string", "utc_offset": 1, "verified": true } }
+{"coordinates":{"coordinates":[1.1],"type":"string"},"created_at":"string","entities":{"urls":[{"display_url":"string","expanded_url":"string","indices":[1],"url":"string"}],"user_mentions":[{"id":1,"id_str":"string","indices":[1],"name":"string","screen_name":"string"}]},"favorite_count":1,"favorited":true,"filter_level":"string","geo":{"coordinates":[1.1],"type":"string"},"id":"0000000","id_str":"string","in_reply_to_screen_name":"string","in_reply_to_status_id":1,"in_reply_to_status_id_str":"string","in_reply_to_user_id":1,"in_reply_to_user_id_str":"string","is_quote_status":true,"lang":"string","place":{"bounding_box":{"coordinates":[[[1.1]]],"type":"string"},"country":"string","country_code":"string","full_name":"string","id":"string","name":"string","place_type":"string","url":"string"},"possibly_sensitive":true,"quoted_status":{"created_at":"string","entities":{"user_mentions":[{"id":1,"id_str":"string","indices":[1],"name":"string","screen_name":"string"}]},"favorite_count":1,"favorited":true,"filter_level":"string","id":1,"id_str":"string","in_reply_to_screen_name":"string","in_reply_to_status_id":1,"in_reply_to_status_id_str":"string","in_reply_to_user_id":1,"in_reply_to_user_id_str":"string","is_quote_status":true,"lang":"string","retweet_count":1,"retweeted":true,"source":"string","text":"string","truncated":true,"user":{"contributors_enabled":true,"created_at":"string","default_profile":true,"default_profile_image":true,"description":"string","favourites_count":1,"followers_count":1,"friends_count":1,"geo_enabled":true,"id":1,"id_str":"string","is_translator":true,"lang":"string","listed_count":1,"name":"string","profile_background_color":"string","profile_background_image_url":"string","profile_background_image_url_https":"string","profile_background_tile":true,"profile_banner_url":"string","profile_image_url":"string","profile_image_url_https":"string","profile_link_color":"string","profile_sidebar_border_color":"string","profile_sidebar_fill_color":"string","profile_text_color":"string","profile_use_background_image":true,"protected":true,"screen_name":"string","statuses_count":1,"verified":true}},"quoted_status_id":1,"quoted_status_id_str":"string","retweet_count":1,"retweeted":true,"source":"string","text":"string","timestamp_ms":"string","truncated":true,"user":{"contributors_enabled":true,"created_at":"string","default_profile":true,"default_profile_image":true,"description":"string","favourites_count":1,"followers_count":1,"friends_count":1,"geo_enabled":true,"id":1,"id_str":"string","is_translator":true,"lang":"string","listed_count":1,"location":"string","name":"string","profile_background_color":"string","profile_background_image_url":"string","profile_background_image_url_https":"string","profile_background_tile":true,"profile_banner_url":"string","profile_image_url":"string","profile_image_url_https":"string","profile_link_color":"string","profile_sidebar_border_color":"string","profile_sidebar_fill_color":"string","profile_text_color":"string","profile_use_background_image":true,"protected":true,"screen_name":"string","statuses_count":1,"time_zone":"string","url":"string","utc_offset":1,"verified":true}}
+{"coordinates":{"coordinates":[1.1],"type":"string"},"created_at":"string","favorite_count":1,"favorited":true,"filter_level":"string","geo":{"coordinates":[1.1],"type":"string"},"id":"11111111111111111111","id_str":"string","in_reply_to_screen_name":"string","in_reply_to_status_id":1,"in_reply_to_status_id_str":"string","in_reply_to_user_id":1,"in_reply_to_user_id_str":"string","is_quote_status":true,"lang":"string","place":{"bounding_box":{"coordinates":[[[1.1]]],"type":"string"},"country":"string","country_code":"string","full_name":"string","id":"string","name":"string","place_type":"string","url":"string"},"possibly_sensitive":true,"quoted_status":{"created_at":"string","entities":{"user_mentions":[{"id":1,"id_str":"string","indices":[1],"name":"string","screen_name":"string"}]},"favorite_count":1,"favorited":true,"filter_level":"string","id":1,"id_str":"string","in_reply_to_screen_name":"string","in_reply_to_status_id":1,"in_reply_to_status_id_str":"string","in_reply_to_user_id":1,"in_reply_to_user_id_str":"string","is_quote_status":true,"lang":"string","retweet_count":1,"retweeted":true,"source":"string","text":"string","truncated":true,"user":{"contributors_enabled":true,"created_at":"string","default_profile":true,"default_profile_image":true,"description":"string","favourites_count":1,"followers_count":1,"friends_count":1,"geo_enabled":true,"id":1,"id_str":"string","is_translator":true,"lang":"string","listed_count":1,"name":"string","profile_background_color":"string","profile_background_image_url":"string","profile_background_image_url_https":"string","profile_background_tile":true,"profile_banner_url":"string","profile_image_url":"string","profile_image_url_https":"string","profile_link_color":"string","profile_sidebar_border_color":"string","profile_sidebar_fill_color":"string","profile_text_color":"string","profile_use_background_image":true,"protected":true,"screen_name":"string","statuses_count":1,"verified":true}},"quoted_status_id":1,"quoted_status_id_str":"string","retweet_count":1,"retweeted":true,"source":"string","text":"string","timestamp_ms":"string","truncated":true,"user":{"contributors_enabled":true,"created_at":"string","default_profile":true,"default_profile_image":true,"description":"string","favourites_count":1,"followers_count":1,"friends_count":1,"geo_enabled":true,"id":1,"id_str":"string","is_translator":true,"lang":"string","listed_count":1,"location":"string","name":"string","profile_background_color":"string","profile_background_image_url":"string","profile_background_image_url_https":"string","profile_background_tile":true,"profile_banner_url":"string","profile_image_url":"string","profile_image_url_https":"string","profile_link_color":"string","profile_sidebar_border_color":"string","profile_sidebar_fill_color":"string","profile_text_color":"string","profile_use_background_image":true,"protected":true,"screen_name":"string","statuses_count":1,"time_zone":"string","url":"string","utc_offset":1,"verified":true}}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/000-arrayOfInt.json b/asterixdb/asterix-column/src/test/resources/result/small/000-arrayOfInt.json
index 0ef2261..e8743b9 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/000-arrayOfInt.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/000-arrayOfInt.json
@@ -1,10 +1,10 @@
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
-{ "b": [ [ 1, 2, 3 ], [ 4, 5, 6 ] ] }
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
+{"b":[[1,2,3],[4,5,6]]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/001-arrayObject.json b/asterixdb/asterix-column/src/test/resources/result/small/001-arrayObject.json
index 8857afc..4bfed37 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/001-arrayObject.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/001-arrayObject.json
@@ -1 +1 @@
-{ "a": [ { "b": 1 }, { "b": 2 }, { "c": 3 } ] }
+{"a":[{"b":1},{"b":2},{"c":3}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/002-arrayObject2.json b/asterixdb/asterix-column/src/test/resources/result/small/002-arrayObject2.json
index 9eb300f..656e0b5 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/002-arrayObject2.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/002-arrayObject2.json
@@ -1,4 +1,4 @@
-{ "ommhom": [ { "a": [ { "x": 1, "y": 2 }, { "y": 2 }, { "x": 1 } ], "b": 1, "c": 2, "d": 3 } ] }
-{ "ommhom": [ { "a": [ { "x": 1, "y": 2 }, { "y": 2 }, { "x": 1 } ], "b": 1, "c": 2, "d": 3 } ] }
-{ "ommhom": [ { "a": [ { "x": 1, "y": 2 }, { "y": 2 }, { "x": 1 } ], "b": 1, "c": 2, "d": 3 }, { "f": 3 }, { "k": { "v": { "t": 1 } } }, { "a": [ { "j": 1 } ] } ] }
-{ "ommhom": [ { "xyz": [ { "x": 1, "y": 2 }, { "y": 2 }, { "x": 1 } ] } ] }
+{"ommhom":[{"a":[{"x":1,"y":2},{"y":2},{"x":1}],"b":1,"c":2,"d":3}]}
+{"ommhom":[{"a":[{"x":1,"y":2},{"y":2},{"x":1}],"b":1,"c":2,"d":3}]}
+{"ommhom":[{"a":[{"x":1,"y":2},{"y":2},{"x":1}],"b":1,"c":2,"d":3},{"f":3},{"k":{"v":{"t":1}}},{"a":[{"j":1}]}]}
+{"ommhom":[{"xyz":[{"x":1,"y":2},{"y":2},{"x":1}]}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/003-arrayEmpty.json b/asterixdb/asterix-column/src/test/resources/result/small/003-arrayEmpty.json
index 3b8b6cc..77555c0 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/003-arrayEmpty.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/003-arrayEmpty.json
@@ -1,3 +1,3 @@
-{ "a": [ { "b": 1 }, { "b": 2 }, { "c": 3 } ] }
-{ "a": [  ] }
-{ "a": [ { "b": 1 }, { "b": 2 }, { "c": 3 } ] }
\ No newline at end of file
+{"a":[{"b":1},{"b":2},{"c":3}]}
+{"a":[]}
+{"a":[{"b":1},{"b":2},{"c":3}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/100-addFields.json b/asterixdb/asterix-column/src/test/resources/result/small/100-addFields.json
index 1ce59bc..fb02498 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/100-addFields.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/100-addFields.json
@@ -1,4 +1,4 @@
-{ "a": 1 }
-{ "a": 1, "b": 2 }
-{ "a": 1, "c": 3 }
-{ "a": 1, "b": 2, "c": 3 }
+{"a":1}
+{"a":1,"b":2}
+{"a":1,"c":3}
+{"a":1,"b":2,"c":3}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/101-nestedAddFields.json b/asterixdb/asterix-column/src/test/resources/result/small/101-nestedAddFields.json
index f51e0df..2d796b3 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/101-nestedAddFields.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/101-nestedAddFields.json
@@ -1,4 +1,4 @@
-{ "a": { "b": { "c": 1 } } }
-{ "a": { "b": { "c": 1, "d": 2 }, "x": { "y": 2 } } }
-{ "a": { "b": { "c": 1 }, "x": { "z": 2 } } }
-{ "a": { "b": { "c": 1 } } }
\ No newline at end of file
+{"a":{"b":{"c":1}}}
+{"a":{"b":{"c":1,"d":2},"x":{"y":2}}}
+{"a":{"b":{"c":1},"x":{"z":2}}}
+{"a":{"b":{"c":1}}}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/200-unionPrimitive.json b/asterixdb/asterix-column/src/test/resources/result/small/200-unionPrimitive.json
index 37d3d92..db61955 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/200-unionPrimitive.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/200-unionPrimitive.json
@@ -1,4 +1,4 @@
-{ "a": 1.25 }
-{ "a": 1 }
-{ "a": "test" }
-{ "a": 2.25 }
+{"a":1.25}
+{"a":1}
+{"a":"test"}
+{"a":2.25}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/201-unionPrimitiveObject.json b/asterixdb/asterix-column/src/test/resources/result/small/201-unionPrimitiveObject.json
index 249fee0..2555214 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/201-unionPrimitiveObject.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/201-unionPrimitiveObject.json
@@ -1,2 +1,2 @@
-{ "a": 1 }
-{ "a": { "b": 1 } }
+{"a":1}
+{"a":{"b":1}}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/202-unionPrimitiveArray.json b/asterixdb/asterix-column/src/test/resources/result/small/202-unionPrimitiveArray.json
index 6624e9b..e474bb4 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/202-unionPrimitiveArray.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/202-unionPrimitiveArray.json
@@ -1,4 +1,4 @@
-{ "a": 1 }
-{ "a": [ { "b": 1 }, { "b": 2 }, { "b": 3 } ] }
-{ "a": 1 }
-{ "a": [ { "b": 1, "c": 10 }, { "b": 2, "c": 11 }, { "b": 3, "c": 12 } ] }
+{"a":1}
+{"a":[{"b":1},{"b":2},{"b":3}]}
+{"a":1}
+{"a":[{"b":1,"c":10},{"b":2,"c":11},{"b":3,"c":12}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/203-unionNestedNested.json b/asterixdb/asterix-column/src/test/resources/result/small/203-unionNestedNested.json
index 5130db99..bf706be 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/203-unionNestedNested.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/203-unionNestedNested.json
@@ -1,4 +1,4 @@
-{ "a": { "b": 1 } }
-{ "a": [ { "b": 1 }, { "b": 2 }, { "b": 3 } ] }
-{ "a": { "b": 1 } }
-{ "a": [ { "b": 1, "c": 10 }, { "b": 2, "c": 11 }, { "b": 3, "c": 12 } ] }
+{"a":{"b":1}}
+{"a":[{"b":1},{"b":2},{"b":3}]}
+{"a":{"b":1}}
+{"a":[{"b":1,"c":10},{"b":2,"c":11},{"b":3,"c":12}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/204-unionArrayPrimitiveItems.json b/asterixdb/asterix-column/src/test/resources/result/small/204-unionArrayPrimitiveItems.json
index e468ab2..b74f4b1 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/204-unionArrayPrimitiveItems.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/204-unionArrayPrimitiveItems.json
@@ -1,5 +1,5 @@
-{ "a": [ 1 ] }
-{ "a": [ "1" ] }
-{ "a": [ false ] }
-{ "a": [ 1.25 ] }
-{ "a": [ 1, "1", false, 1.25 ] }
+{"a":[1]}
+{"a":["1"]}
+{"a":[false]}
+{"a":[1.25]}
+{"a":[1,"1",false,1.25]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/205-unionArrayPrimitiveObjectItems.json b/asterixdb/asterix-column/src/test/resources/result/small/205-unionArrayPrimitiveObjectItems.json
index 869a4e6..33327d2 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/205-unionArrayPrimitiveObjectItems.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/205-unionArrayPrimitiveObjectItems.json
@@ -1,5 +1,5 @@
-{ "a": [ 1 ] }
-{ "a": [ { "a": 1 } ] }
-{ "a": [ false ] }
-{ "a": [ { "b": 1 } ] }
-{ "a": [ 1, { "a": 1 }, false, { "b": 1 }, { "c": 1 } ] }
+{"a":[1]}
+{"a":[{"a":1}]}
+{"a":[false]}
+{"a":[{"b":1}]}
+{"a":[1,{"a":1},false,{"b":1},{"c":1}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/206-unionArrayPrimitiveObjectArrayItems.json b/asterixdb/asterix-column/src/test/resources/result/small/206-unionArrayPrimitiveObjectArrayItems.json
index 2a54e7f..557a9e8 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/206-unionArrayPrimitiveObjectArrayItems.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/206-unionArrayPrimitiveObjectArrayItems.json
@@ -1,5 +1,5 @@
-{ "a": [ 1 ] }
-{ "a": [ [ { "a": 1 } ] ] }
-{ "a": [ false ] }
-{ "a": [ { "b": 5 } ] }
-{ "a": [ 1, { "a": 5 }, false, [ { "b": 1 } ], [ { "c": 1 } ] ] }
+{"a":[1]}
+{"a":[[{"a":1}]]}
+{"a":[false]}
+{"a":[{"b":5}]}
+{"a":[1,{"a":5},false,[{"b":1}],[{"c":1}]]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/207-unionArrayNullItems0.json b/asterixdb/asterix-column/src/test/resources/result/small/207-unionArrayNullItems0.json
index f8faf4c..e929ee3 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/207-unionArrayNullItems0.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/207-unionArrayNullItems0.json
@@ -1,3 +1,3 @@
-{ "a": [ null ] }
-{ "a": [ 1 ] }
-{ "a": [ "string" ] }
\ No newline at end of file
+{"a":[null]}
+{"a":[1]}
+{"a":["string"]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/208-unionArrayNullItems1.json b/asterixdb/asterix-column/src/test/resources/result/small/208-unionArrayNullItems1.json
index eb3fc85..1e8b301 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/208-unionArrayNullItems1.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/208-unionArrayNullItems1.json
@@ -1,3 +1,3 @@
-{ "a": [ 1 ] }
-{ "a": [ null ] }
-{ "a": [ "string" ] }
\ No newline at end of file
+{"a":[1]}
+{"a":[null]}
+{"a":["string"]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/209-unionArrayNullItems2.json b/asterixdb/asterix-column/src/test/resources/result/small/209-unionArrayNullItems2.json
index da80268..c07b643 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/209-unionArrayNullItems2.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/209-unionArrayNullItems2.json
@@ -1,3 +1,3 @@
-{ "a": [ 0, "1", null ] }
-{ "a": [ 0, null, "1" ] }
-{ "a": [ null, 0, "1" ] }
\ No newline at end of file
+{"a":[0,"1",null]}
+{"a":[0,null,"1"]}
+{"a":[null,0,"1"]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/210-unionArrayNullItems3.json b/asterixdb/asterix-column/src/test/resources/result/small/210-unionArrayNullItems3.json
index 00fd767..8a5848a 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/210-unionArrayNullItems3.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/210-unionArrayNullItems3.json
@@ -1 +1 @@
-{ "a": [ 0, null, "1" ] }
\ No newline at end of file
+{"a":[0,null,"1"]}
\ No newline at end of file
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/301-null-primitive.json b/asterixdb/asterix-column/src/test/resources/result/small/301-null-primitive.json
index aeb319a..57232a9 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/301-null-primitive.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/301-null-primitive.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": null }
-{ "a": null }
-{ "a": 1 }
+{"a":null}
+{"a":null}
+{"a":null}
+{"a":1}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/310-null-object0.json b/asterixdb/asterix-column/src/test/resources/result/small/310-null-object0.json
index b563190..2379cf0 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/310-null-object0.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/310-null-object0.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": null }
-{ "a": { "b": 1, "c": 5 } }
-{ "a": { "b": null, "c": null } }
+{"a":null}
+{"a":null}
+{"a":{"b":1,"c":5}}
+{"a":{"b":null,"c":null}}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/311-null-object1.json b/asterixdb/asterix-column/src/test/resources/result/small/311-null-object1.json
index ee4a6ce..9cd9b35 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/311-null-object1.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/311-null-object1.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": null }
-{ "a": { "b": null, "c": 5 } }
-{ "a": { "b": 1, "c": null } }
+{"a":null}
+{"a":null}
+{"a":{"b":null,"c":5}}
+{"a":{"b":1,"c":null}}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/312-null-object2.json b/asterixdb/asterix-column/src/test/resources/result/small/312-null-object2.json
index 0609637..9539007 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/312-null-object2.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/312-null-object2.json
@@ -1,4 +1,4 @@
-{ "a": { "b": 1, "c": null } }
-{ "a": { "b": null, "c": 5 } }
-{ "a": null }
-{ "a": null }
+{"a":{"b":1,"c":null}}
+{"a":{"b":null,"c":5}}
+{"a":null}
+{"a":null}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/313-null-object3.json b/asterixdb/asterix-column/src/test/resources/result/small/313-null-object3.json
index 9c54517..1be1683 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/313-null-object3.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/313-null-object3.json
@@ -1,4 +1,4 @@
-{ "a": { "b": null, "c": null } }
-{ "a": { "b": 1, "c": 5 } }
-{ "a": null }
-{ "a": null }
+{"a":{"b":null,"c":null}}
+{"a":{"b":1,"c":5}}
+{"a":null}
+{"a":null}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/320-null-array0.json b/asterixdb/asterix-column/src/test/resources/result/small/320-null-array0.json
index e1d6d6f..e4b6ae1 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/320-null-array0.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/320-null-array0.json
@@ -1,4 +1,4 @@
-{ "a": [ null ] }
-{ "a": null }
-{ "a": [ 1 ] }
-{ "a": [ 3, null, 4 ] }
+{"a":[null]}
+{"a":null}
+{"a":[1]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/321-null-array1.json b/asterixdb/asterix-column/src/test/resources/result/small/321-null-array1.json
index e1d6d6f..e4b6ae1 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/321-null-array1.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/321-null-array1.json
@@ -1,4 +1,4 @@
-{ "a": [ null ] }
-{ "a": null }
-{ "a": [ 1 ] }
-{ "a": [ 3, null, 4 ] }
+{"a":[null]}
+{"a":null}
+{"a":[1]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/322-null-array2.json b/asterixdb/asterix-column/src/test/resources/result/small/322-null-array2.json
index 83f9f0c..8ca1c4f 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/322-null-array2.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/322-null-array2.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": [ null ] }
-{ "a": [ 1 ] }
-{ "a": [ 3, null, 4 ] }
+{"a":null}
+{"a":[null]}
+{"a":[1]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/323-null-array3.json b/asterixdb/asterix-column/src/test/resources/result/small/323-null-array3.json
index f53eae0..ecf07bc 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/323-null-array3.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/323-null-array3.json
@@ -1,4 +1,4 @@
-{ "a": [ null, 1, null ] }
-{ "a": [ null ] }
-{ "a": [ null, null ] }
-{ "a": [ 3, null, 4 ] }
+{"a":[null,1,null]}
+{"a":[null]}
+{"a":[null,null]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/324-null-array4.json b/asterixdb/asterix-column/src/test/resources/result/small/324-null-array4.json
index d12be57..e94fb68 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/324-null-array4.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/324-null-array4.json
@@ -1,4 +1,4 @@
-{ "a": [ 1 ] }
-{ "a": [ null ] }
-{ "a": [ null, null ] }
-{ "a": [ 3, null, 4 ] }
+{"a":[1]}
+{"a":[null]}
+{"a":[null,null]}
+{"a":[3,null,4]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/325-null-array5.json b/asterixdb/asterix-column/src/test/resources/result/small/325-null-array5.json
index a0d9cbf..4e844d6 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/325-null-array5.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/325-null-array5.json
@@ -1,4 +1,4 @@
-{ "a": [ { "a": 1 } ] }
-{ "a": null }
-{ "a": [ null ] }
-{ "a": [ { "a": null, "b": 2 }, null, { "a": 3, "b": null } ] }
+{"a":[{"a":1}]}
+{"a":null}
+{"a":[null]}
+{"a":[{"a":null,"b":2},null,{"a":3,"b":null}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/326-null-array6.json b/asterixdb/asterix-column/src/test/resources/result/small/326-null-array6.json
index 5a37b18..33a810c 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/326-null-array6.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/326-null-array6.json
@@ -1,4 +1,4 @@
-{ "a": null }
-{ "a": [ null ] }
-{ "a": [ { "a": 1 } ] }
-{ "a": [ { "a": null, "b": 2 }, null, { "a": 3, "b": null } ] }
+{"a":null}
+{"a":[null]}
+{"a":[{"a":1}]}
+{"a":[{"a":null,"b":2},null,{"a":3,"b":null}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/327-null-array7.json b/asterixdb/asterix-column/src/test/resources/result/small/327-null-array7.json
index f305582..d7d8ccd 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/327-null-array7.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/327-null-array7.json
@@ -1,4 +1,4 @@
-{ "a": [ { "b": 2, "c": null }, null, { "b": null, "c": 3 } ] }
-{ "a": null }
-{ "a": [ null ] }
-{ "a": [ { "c": 1 } ] }
+{"a":[{"b":2,"c":null},null,{"b":null,"c":3}]}
+{"a":null}
+{"a":[null]}
+{"a":[{"c":1}]}
diff --git a/asterixdb/asterix-column/src/test/resources/result/small/900-dummy-tweet.json b/asterixdb/asterix-column/src/test/resources/result/small/900-dummy-tweet.json
index 53f2518..9bdde86 100644
--- a/asterixdb/asterix-column/src/test/resources/result/small/900-dummy-tweet.json
+++ b/asterixdb/asterix-column/src/test/resources/result/small/900-dummy-tweet.json
@@ -1,2 +1,2 @@
-{ "coordinates": { "coordinates": [ 1.1 ], "type": "string" }, "created_at": "string", "entities": { "urls": [ { "display_url": "string", "expanded_url": "string", "indices": [ 1 ], "url": "string" } ], "user_mentions": [ { "id": 1, "id_str": "string", "indices": [ 1 ], "name": "string", "screen_name": "string" } ] }, "favorite_count": 1, "favorited": true, "filter_level": "string", "geo": { "coordinates": [ 1.1 ], "type": "string" }, "id": "0000000", "id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_status_id": 1, "in_reply_to_status_id_str": "string", "in_reply_to_user_id": 1, "in_reply_to_user_id_str": "string", "is_quote_status": true, "lang": "string", "place": { "bounding_box": { "coordinates": [ [ [ 1.1 ] ] ], "type": "string" }, "country": "string", "country_code": "string", "full_name": "string", "id": "string", "name": "string", "place_type": "string", "url": "string" }, "possibly_sensitive": true, "quoted_status": { "created_at": "string", "entities": { "user_mentions": [ { "id": 1, "id_str": "string", "indices": [ 1 ], "name": "string", "screen_name": "string" } ] }, "favorite_count": 1, "favorited": true, "filter_level": "string", "id": 1, "id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_status_id": 1, "in_reply_to_status_id_str": "string", "in_reply_to_user_id": 1, "in_reply_to_user_id_str": "string", "is_quote_status": true, "lang": "string", "retweet_count": 1, "retweeted": true, "source": "string", "text": "string", "truncated": true, "user": { "contributors_enabled": true, "created_at": "string", "default_profile": true, "default_profile_image": true, "description": "string", "favourites_count": 1, "followers_count": 1, "friends_count": 1, "geo_enabled": true, "id": 1, "id_str": "string", "is_translator": true, "lang": "string", "listed_count": 1, "name": "string", "profile_background_color": "string", "profile_background_image_url": "string", "profile_background_image_url_https": "string", "profile_background_tile": true, "profile_banner_url": "string", "profile_image_url": "string", "profile_image_url_https": "string", "profile_link_color": "string", "profile_sidebar_border_color": "string", "profile_sidebar_fill_color": "string", "profile_text_color": "string", "profile_use_background_image": true, "protected": true, "screen_name": "string", "statuses_count": 1, "verified": true } }, "quoted_status_id": 1, "quoted_status_id_str": "string", "retweet_count": 1, "retweeted": true, "source": "string", "text": "string", "timestamp_ms": "string", "truncated": true, "user": { "contributors_enabled": true, "created_at": "string", "default_profile": true, "default_profile_image": true, "description": "string", "favourites_count": 1, "followers_count": 1, "friends_count": 1, "geo_enabled": true, "id": 1, "id_str": "string", "is_translator": true, "lang": "string", "listed_count": 1, "location": "string", "name": "string", "profile_background_color": "string", "profile_background_image_url": "string", "profile_background_image_url_https": "string", "profile_background_tile": true, "profile_banner_url": "string", "profile_image_url": "string", "profile_image_url_https": "string", "profile_link_color": "string", "profile_sidebar_border_color": "string", "profile_sidebar_fill_color": "string", "profile_text_color": "string", "profile_use_background_image": true, "protected": true, "screen_name": "string", "statuses_count": 1, "time_zone": "string", "url": "string", "utc_offset": 1, "verified": true } }
-{ "coordinates": { "coordinates": [ 1.1 ], "type": "string" }, "created_at": "string", "favorite_count": 1, "favorited": true, "filter_level": "string", "geo": { "coordinates": [ 1.1 ], "type": "string" }, "id": "11111111111111111111", "id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_status_id": 1, "in_reply_to_status_id_str": "string", "in_reply_to_user_id": 1, "in_reply_to_user_id_str": "string", "is_quote_status": true, "lang": "string", "place": { "bounding_box": { "coordinates": [ [ [ 1.1 ] ] ], "type": "string" }, "country": "string", "country_code": "string", "full_name": "string", "id": "string", "name": "string", "place_type": "string", "url": "string" }, "possibly_sensitive": true, "quoted_status": { "created_at": "string", "entities": { "user_mentions": [ { "id": 1, "id_str": "string", "indices": [ 1 ], "name": "string", "screen_name": "string" } ] }, "favorite_count": 1, "favorited": true, "filter_level": "string", "id": 1, "id_str": "string", "in_reply_to_screen_name": "string", "in_reply_to_status_id": 1, "in_reply_to_status_id_str": "string", "in_reply_to_user_id": 1, "in_reply_to_user_id_str": "string", "is_quote_status": true, "lang": "string", "retweet_count": 1, "retweeted": true, "source": "string", "text": "string", "truncated": true, "user": { "contributors_enabled": true, "created_at": "string", "default_profile": true, "default_profile_image": true, "description": "string", "favourites_count": 1, "followers_count": 1, "friends_count": 1, "geo_enabled": true, "id": 1, "id_str": "string", "is_translator": true, "lang": "string", "listed_count": 1, "name": "string", "profile_background_color": "string", "profile_background_image_url": "string", "profile_background_image_url_https": "string", "profile_background_tile": true, "profile_banner_url": "string", "profile_image_url": "string", "profile_image_url_https": "string", "profile_link_color": "string", "profile_sidebar_border_color": "string", "profile_sidebar_fill_color": "string", "profile_text_color": "string", "profile_use_background_image": true, "protected": true, "screen_name": "string", "statuses_count": 1, "verified": true } }, "quoted_status_id": 1, "quoted_status_id_str": "string", "retweet_count": 1, "retweeted": true, "source": "string", "text": "string", "timestamp_ms": "string", "truncated": true, "user": { "contributors_enabled": true, "created_at": "string", "default_profile": true, "default_profile_image": true, "description": "string", "favourites_count": 1, "followers_count": 1, "friends_count": 1, "geo_enabled": true, "id": 1, "id_str": "string", "is_translator": true, "lang": "string", "listed_count": 1, "location": "string", "name": "string", "profile_background_color": "string", "profile_background_image_url": "string", "profile_background_image_url_https": "string", "profile_background_tile": true, "profile_banner_url": "string", "profile_image_url": "string", "profile_image_url_https": "string", "profile_link_color": "string", "profile_sidebar_border_color": "string", "profile_sidebar_fill_color": "string", "profile_text_color": "string", "profile_use_background_image": true, "protected": true, "screen_name": "string", "statuses_count": 1, "time_zone": "string", "url": "string", "utc_offset": 1, "verified": true } }
+{"coordinates":{"coordinates":[1.1],"type":"string"},"created_at":"string","entities":{"urls":[{"display_url":"string","expanded_url":"string","indices":[1],"url":"string"}],"user_mentions":[{"id":1,"id_str":"string","indices":[1],"name":"string","screen_name":"string"}]},"favorite_count":1,"favorited":true,"filter_level":"string","geo":{"coordinates":[1.1],"type":"string"},"id":"0000000","id_str":"string","in_reply_to_screen_name":"string","in_reply_to_status_id":1,"in_reply_to_status_id_str":"string","in_reply_to_user_id":1,"in_reply_to_user_id_str":"string","is_quote_status":true,"lang":"string","place":{"bounding_box":{"coordinates":[[[1.1]]],"type":"string"},"country":"string","country_code":"string","full_name":"string","id":"string","name":"string","place_type":"string","url":"string"},"possibly_sensitive":true,"quoted_status":{"created_at":"string","entities":{"user_mentions":[{"id":1,"id_str":"string","indices":[1],"name":"string","screen_name":"string"}]},"favorite_count":1,"favorited":true,"filter_level":"string","id":1,"id_str":"string","in_reply_to_screen_name":"string","in_reply_to_status_id":1,"in_reply_to_status_id_str":"string","in_reply_to_user_id":1,"in_reply_to_user_id_str":"string","is_quote_status":true,"lang":"string","retweet_count":1,"retweeted":true,"source":"string","text":"string","truncated":true,"user":{"contributors_enabled":true,"created_at":"string","default_profile":true,"default_profile_image":true,"description":"string","favourites_count":1,"followers_count":1,"friends_count":1,"geo_enabled":true,"id":1,"id_str":"string","is_translator":true,"lang":"string","listed_count":1,"name":"string","profile_background_color":"string","profile_background_image_url":"string","profile_background_image_url_https":"string","profile_background_tile":true,"profile_banner_url":"string","profile_image_url":"string","profile_image_url_https":"string","profile_link_color":"string","profile_sidebar_border_color":"string","profile_sidebar_fill_color":"string","profile_text_color":"string","profile_use_background_image":true,"protected":true,"screen_name":"string","statuses_count":1,"verified":true}},"quoted_status_id":1,"quoted_status_id_str":"string","retweet_count":1,"retweeted":true,"source":"string","text":"string","timestamp_ms":"string","truncated":true,"user":{"contributors_enabled":true,"created_at":"string","default_profile":true,"default_profile_image":true,"description":"string","favourites_count":1,"followers_count":1,"friends_count":1,"geo_enabled":true,"id":1,"id_str":"string","is_translator":true,"lang":"string","listed_count":1,"location":"string","name":"string","profile_background_color":"string","profile_background_image_url":"string","profile_background_image_url_https":"string","profile_background_tile":true,"profile_banner_url":"string","profile_image_url":"string","profile_image_url_https":"string","profile_link_color":"string","profile_sidebar_border_color":"string","profile_sidebar_fill_color":"string","profile_text_color":"string","profile_use_background_image":true,"protected":true,"screen_name":"string","statuses_count":1,"time_zone":"string","url":"string","utc_offset":1,"verified":true}}
+{"coordinates":{"coordinates":[1.1],"type":"string"},"created_at":"string","favorite_count":1,"favorited":true,"filter_level":"string","geo":{"coordinates":[1.1],"type":"string"},"id":"11111111111111111111","id_str":"string","in_reply_to_screen_name":"string","in_reply_to_status_id":1,"in_reply_to_status_id_str":"string","in_reply_to_user_id":1,"in_reply_to_user_id_str":"string","is_quote_status":true,"lang":"string","place":{"bounding_box":{"coordinates":[[[1.1]]],"type":"string"},"country":"string","country_code":"string","full_name":"string","id":"string","name":"string","place_type":"string","url":"string"},"possibly_sensitive":true,"quoted_status":{"created_at":"string","entities":{"user_mentions":[{"id":1,"id_str":"string","indices":[1],"name":"string","screen_name":"string"}]},"favorite_count":1,"favorited":true,"filter_level":"string","id":1,"id_str":"string","in_reply_to_screen_name":"string","in_reply_to_status_id":1,"in_reply_to_status_id_str":"string","in_reply_to_user_id":1,"in_reply_to_user_id_str":"string","is_quote_status":true,"lang":"string","retweet_count":1,"retweeted":true,"source":"string","text":"string","truncated":true,"user":{"contributors_enabled":true,"created_at":"string","default_profile":true,"default_profile_image":true,"description":"string","favourites_count":1,"followers_count":1,"friends_count":1,"geo_enabled":true,"id":1,"id_str":"string","is_translator":true,"lang":"string","listed_count":1,"name":"string","profile_background_color":"string","profile_background_image_url":"string","profile_background_image_url_https":"string","profile_background_tile":true,"profile_banner_url":"string","profile_image_url":"string","profile_image_url_https":"string","profile_link_color":"string","profile_sidebar_border_color":"string","profile_sidebar_fill_color":"string","profile_text_color":"string","profile_use_background_image":true,"protected":true,"screen_name":"string","statuses_count":1,"verified":true}},"quoted_status_id":1,"quoted_status_id_str":"string","retweet_count":1,"retweeted":true,"source":"string","text":"string","timestamp_ms":"string","truncated":true,"user":{"contributors_enabled":true,"created_at":"string","default_profile":true,"default_profile_image":true,"description":"string","favourites_count":1,"followers_count":1,"friends_count":1,"geo_enabled":true,"id":1,"id_str":"string","is_translator":true,"lang":"string","listed_count":1,"location":"string","name":"string","profile_background_color":"string","profile_background_image_url":"string","profile_background_image_url_https":"string","profile_background_tile":true,"profile_banner_url":"string","profile_image_url":"string","profile_image_url_https":"string","profile_link_color":"string","profile_sidebar_border_color":"string","profile_sidebar_fill_color":"string","profile_text_color":"string","profile_use_background_image":true,"protected":true,"screen_name":"string","statuses_count":1,"time_zone":"string","url":"string","utc_offset":1,"verified":true}}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java
index 76768aa..f7acb96 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java
@@ -38,12 +38,12 @@
 public class APrintVisitor extends AbstractPrintVisitor {
     @Override
     protected AListPrinter createListPrinter(AListVisitablePointable accessor) {
-        return new AListPrinter("[ ", " ]", ", ");
+        return new AListPrinter("[", "]", ",");
     }
 
     @Override
     protected ARecordPrinter createRecordPrinter(ARecordVisitablePointable accessor) {
-        return new ARecordPrinter("{ ", " }", ", ", ": ");
+        return new ARecordPrinter("{", "}", ",", ":");
     }
 
     @Override
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/losslessadm/APrintVisitor.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/losslessadm/APrintVisitor.java
index 025590b..0decbaa 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/losslessadm/APrintVisitor.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/losslessadm/APrintVisitor.java
@@ -39,7 +39,7 @@
 
     @Override
     protected AListPrinter createListPrinter(AListVisitablePointable accessor) {
-        return new AListPrinter("[ ", " ]", ", ") {
+        return new AListPrinter("[", "]", ",") {
             @Override
             protected ATypeTag getItemTypeTag(IVisitablePointable item, ATypeTag typeTag) {
                 // avoid MISSING to NULL conversion, because we print MISSING as is in this format
@@ -50,7 +50,7 @@
 
     @Override
     protected ARecordPrinter createRecordPrinter(ARecordVisitablePointable accessor) {
-        return new ARecordPrinter("{ ", " }", ", ", ": ") {
+        return new ARecordPrinter("{", "}", ",", ":") {
             @Override
             protected void printFieldName(PrintStream ps, IPrintVisitor visitor, IVisitablePointable fieldName)
                     throws HyracksDataException {
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionManager.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionManager.java
index 7158558..d58eeeb 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionManager.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionManager.java
@@ -65,9 +65,11 @@
         Pair<FunctionIdentifier, Integer> key = new Pair<>(fid, fid.getArity());
         IFunctionDescriptorFactory factory = functions.get(key);
         if (factory == null) {
-            String msg = "Inappropriate use of function '" + fid.getName() + "'";
+            String msg;
             if (fid.equals(BuiltinFunctions.META)) {
-                msg = msg + ". For example, after GROUP BY";
+                msg = "No source collection found for META(): collection not supported or cannot reference collection";
+            } else {
+                msg = "Could not resolve function '" + fid.getName() + "'";
             }
             throw AsterixException.create(ErrorCode.COMPILATION_ERROR, src, msg);
         }
diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/writers/PrinterBasedWriterFactory.java b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/writers/PrinterBasedWriterFactory.java
index 015ce73..6fcbdce 100644
--- a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/writers/PrinterBasedWriterFactory.java
+++ b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/writers/PrinterBasedWriterFactory.java
@@ -61,11 +61,10 @@
                             + tAccess.getFieldStartOffset(tIdx, fields[i]);
                     int fldLen = tAccess.getFieldLength(tIdx, fields[i]);
                     if (i > 0) {
-                        printStream.print("; ");
+                        printStream.print(';');
                     }
                     printers[i].print(tAccess.getBuffer().array(), fldStart, fldLen, printStream);
                 }
-                printStream.println();
             }
         };
     }
diff --git a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java
index d23f7f9..9265f52 100644
--- a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java
+++ b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java
@@ -178,7 +178,7 @@
 
         StringBuilder buf = new StringBuilder();
         readFileToString(outFile, buf);
-        Assert.assertEquals("400; 3", buf.toString());
+        Assert.assertEquals("400;3", buf.toString());
         outFile.delete();
     }
 
@@ -570,7 +570,7 @@
 
         StringBuilder buf = new StringBuilder();
         readFileToString(outFile, buf);
-        Assert.assertEquals("400; 3", buf.toString());
+        Assert.assertEquals("400;3", buf.toString());
         outFile.delete();
     }
 
@@ -796,9 +796,9 @@
         RecordDescriptor sortDesc = scannerDesc;
 
         String fileName = "scanMicroSortWrite.out";
-        String filePath = PATH_ACTUAL + SEPARATOR + fileName;
-        String resultFilePath = PATH_EXPECTED + SEPARATOR + fileName;
-        File outFile = new File(filePath);
+        String actualFilePath = PATH_ACTUAL + SEPARATOR + fileName;
+        String expectedFilePath = PATH_EXPECTED + SEPARATOR + fileName;
+        File outFile = new File(actualFilePath);
         SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 0, 1, 2, 3 },
                 new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE, UTF8StringPrinterFactory.INSTANCE,
                         IntegerPrinterFactory.INSTANCE, UTF8StringPrinterFactory.INSTANCE },
@@ -814,7 +814,7 @@
         spec.addRoot(algebricksOp);
         AlgebricksHyracksIntegrationUtil.runJob(spec);
 
-        compareFiles(filePath, resultFilePath);
+        compareFiles(expectedFilePath, actualFilePath);
         outFile.delete();
     }
 
diff --git a/hyracks-fullstack/algebricks/algebricks-tests/src/test/resources/results/scanMicroSortWrite.out b/hyracks-fullstack/algebricks/algebricks-tests/src/test/resources/results/scanMicroSortWrite.out
index 1c0fd6a..978196c 100644
--- a/hyracks-fullstack/algebricks/algebricks-tests/src/test/resources/results/scanMicroSortWrite.out
+++ b/hyracks-fullstack/algebricks/algebricks-tests/src/test/resources/results/scanMicroSortWrite.out
@@ -1,25 +1 @@
-0; "ALGERIA"; 0; " haggle. carefully final deposits detect slyly agai"
-1; "ARGENTINA"; 1; "al foxes promise slyly according to the regular accounts. bold requests alon"
-2; "BRAZIL"; 1; "y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special "
-3; "CANADA"; 1; "eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold"
-18; "CHINA"; 2; "c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos"
-4; "EGYPT"; 4; "y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d"
-5; "ETHIOPIA"; 0; "ven packages wake quickly. regu"
-6; "FRANCE"; 3; "refully final requests. regular, ironi"
-7; "GERMANY"; 3; "l platelets. regular accounts x-ray: unusual, regular acco"
-8; "INDIA"; 2; "ss excuses cajole slyly across the packages. deposits print aroun"
-9; "INDONESIA"; 2; " slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull"
-10; "IRAN"; 4; "efully alongside of the slyly final dependencies. "
-11; "IRAQ"; 4; "nic deposits boost atop the quickly final requests? quickly regula"
-12; "JAPAN"; 2; "ously. final, express gifts cajole a"
-13; "JORDAN"; 4; "ic deposits are blithely about the carefully regular pa"
-14; "KENYA"; 0; " pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t"
-15; "MOROCCO"; 0; "rns. blithely bold courts among the closely regular packages use furiously bold platelets?"
-16; "MOZAMBIQUE"; 0; "s. ironic, unusual asymptotes wake blithely r"
-17; "PERU"; 1; "platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun"
-19; "ROMANIA"; 3; "ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account"
-22; "RUSSIA"; 3; " requests against the platelets use never according to the quickly regular pint"
-20; "SAUDI ARABIA"; 4; "ts. silent requests haggle. closely express packages sleep across the blithely"
-23; "UNITED KINGDOM"; 3; "eans boost carefully special requests. accounts are. carefull"
-24; "UNITED STATES"; 1; "y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be"
-21; "VIETNAM"; 2; "hely enticingly express accounts. even, final "
+0;"ALGERIA";0;" haggle. carefully final deposits detect slyly agai"1;"ARGENTINA";1;"al foxes promise slyly according to the regular accounts. bold requests alon"2;"BRAZIL";1;"y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special "3;"CANADA";1;"eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold"18;"CHINA";2;"c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos"4;"EGYPT";4;"y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d"5;"ETHIOPIA";0;"ven packages wake quickly. regu"6;"FRANCE";3;"refully final requests. regular, ironi"7;"GERMANY";3;"l platelets. regular accounts x-ray: unusual, regular acco"8;"INDIA";2;"ss excuses cajole slyly across the packages. deposits print aroun"9;"INDONESIA";2;" slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull"10;"IRAN";4;"efully alongside of the slyly final dependencies. "11;"IRAQ";4;"nic deposits boost atop the quickly final requests? quickly regula"12;"JAPAN";2;"ously. final, express gifts cajole a"13;"JORDAN";4;"ic deposits are blithely about the carefully regular pa"14;"KENYA";0;" pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t"15;"MOROCCO";0;"rns. blithely bold courts among the closely regular packages use furiously bold platelets?"16;"MOZAMBIQUE";0;"s. ironic, unusual asymptotes wake blithely r"17;"PERU";1;"platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun"19;"ROMANIA";3;"ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account"22;"RUSSIA";3;" requests against the platelets use never according to the quickly regular pint"20;"SAUDI ARABIA";4;"ts. silent requests haggle. closely express packages sleep across the blithely"23;"UNITED KINGDOM";3;"eans boost carefully special requests. accounts are. carefull"24;"UNITED STATES";1;"y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be"21;"VIETNAM";2;"hely enticingly express accounts. even, final "
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
index d6698fe..a386ab8 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
@@ -34,6 +34,7 @@
 import java.util.TimerTask;
 import java.util.TreeMap;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import org.apache.hyracks.api.application.IApplication;
 import org.apache.hyracks.api.application.ICCApplication;
@@ -78,6 +79,7 @@
 import org.apache.hyracks.control.common.ipc.CCNCFunctions;
 import org.apache.hyracks.control.common.logs.LogFile;
 import org.apache.hyracks.control.common.shutdown.ShutdownRun;
+import org.apache.hyracks.control.common.utils.HyracksThreadFactory;
 import org.apache.hyracks.control.common.work.WorkQueue;
 import org.apache.hyracks.ipc.api.IIPCI;
 import org.apache.hyracks.ipc.impl.IPCSystem;
@@ -118,7 +120,7 @@
 
     private final WorkQueue workQueue;
 
-    private ExecutorService executor;
+    private ExecutorService executor = Executors.newCachedThreadPool(new HyracksThreadFactory("<bootstrap>"));
 
     private final Timer timer;
 
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
index e173dcb..f3df6a8 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
@@ -35,6 +35,7 @@
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
@@ -72,6 +73,7 @@
 import org.apache.hyracks.control.common.ipc.CCNCFunctions;
 import org.apache.hyracks.control.common.ipc.ClusterControllerRemoteProxy;
 import org.apache.hyracks.control.common.job.profiling.om.JobProfile;
+import org.apache.hyracks.control.common.utils.HyracksThreadFactory;
 import org.apache.hyracks.control.common.work.FutureValue;
 import org.apache.hyracks.control.common.work.WorkQueue;
 import org.apache.hyracks.control.nc.application.NCServiceContext;
@@ -145,7 +147,7 @@
 
     private final Map<JobId, JobParameterByteStore> jobParameterByteStoreMap = new HashMap<>();
 
-    private ExecutorService executor;
+    private ExecutorService executor = Executors.newCachedThreadPool(new HyracksThreadFactory("<bootstrap>"));
 
     private Map<CcId, HeartbeatManager> heartbeatManagers = new ConcurrentHashMap<>();