diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.001.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.001.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.001.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.002.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.002.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.002.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.002.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.003.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.003.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.003.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.003.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.004.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.004.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.004.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.004.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.005.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.005.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.005.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.006.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.006.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/assembly.006.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/001/001.006.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.001.ddl.sqlpp
new file mode 100644
index 0000000..06d2d97
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.001.ddl.sqlpp
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+DROP DATAVERSE test if exists;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE ColumnType AS {
+    id: int
+};
+
+CREATE DATASET ColumnDataset(ColumnType)
+PRIMARY KEY id WITH {
+    "storage-format": {"format" : "column"}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.002.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.002.update.sqlpp
new file mode 100644
index 0000000..ee80beb
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.002.update.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- All coordinates are of type BIGINT
+INSERT INTO ColumnDataset (
+    {"id": 1, "geo" : {"coordinates": [1, 2]}},
+    {"id": 2, "geo" : {"coordinates": [1, 2]}},
+    {"id": 3, "geo" : {"coordinates": [1, 2]}},
+    {"id": 4, "geo" : {"coordinates": [1, 2]}}
+);
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.003.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.003.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.003.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.004.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.004.update.sqlpp
new file mode 100644
index 0000000..b28c8cf
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.004.update.sqlpp
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- Now, coordinates is of type union(BIGINT, DOUBLE)
+INSERT INTO ColumnDataset (
+    {"id": 5, "geo" : {"coordinates": [1, 2.1]}},
+    {"id": 6, "geo" : {"coordinates": [1, 2]}},
+    {"id": 7, "geo" : {"coordinates": [1, 2]}},
+    {"id": 8, "geo" : {"coordinates": [1, 2]}}
+);
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.005.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.005.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.005.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.006.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.006.query.sqlpp
new file mode 100644
index 0000000..0dc3421
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.006.query.sqlpp
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- ASTERIXDB-3169
+SELECT VALUE c
+FROM ColumnDataset c
+ORDER BY c.id;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.007.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.007.update.sqlpp
new file mode 100644
index 0000000..d8e4936
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.007.update.sqlpp
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- All coordinates are of type BIGINT
+COMPACT DATASET ColumnDataset;
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.008.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.008.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.008.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.009.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.009.query.sqlpp
new file mode 100644
index 0000000..1584cfa
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/002/002.009.query.sqlpp
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- Query merged components
+SELECT VALUE c
+FROM ColumnDataset c
+ORDER BY c.id;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.001.ddl.sqlpp
new file mode 100644
index 0000000..06d2d97
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.001.ddl.sqlpp
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+DROP DATAVERSE test if exists;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE ColumnType AS {
+    id: int
+};
+
+CREATE DATASET ColumnDataset(ColumnType)
+PRIMARY KEY id WITH {
+    "storage-format": {"format" : "column"}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.002.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.002.update.sqlpp
new file mode 100644
index 0000000..8d6a147
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.002.update.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- No 'lat'
+INSERT INTO ColumnDataset (
+    {"id": 1, "geo" : {"coordinates": [{"lon": 1}]}},
+    {"id": 2, "geo" : {"coordinates": [{"lon": 2}]}},
+    {"id": 3, "geo" : {"coordinates": [{"lon": 3}]}},
+    {"id": 4, "geo" : {"coordinates": [{"lon": 4}]}}
+);
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.003.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.003.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.003.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.004.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.004.update.sqlpp
new file mode 100644
index 0000000..438e15c
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.004.update.sqlpp
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- WITH 'lat'
+-- Also, 'lon' type now is union(BIGINT, union(BIGINT, DOUBLE))
+INSERT INTO ColumnDataset (
+    {"id": 5, "geo" : {"coordinates": [{"lon": [5.1], "lat": 1}]}},
+    {"id": 6, "geo" : {"coordinates": [{"lon": [6], "lat": 2}]}},
+    {"id": 7, "geo" : {"coordinates": [{"lon": 7, "lat": 3}]}},
+    {"id": 8, "geo" : {"coordinates": [{"lat": 4}]}}
+);
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.005.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.005.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.005.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.006.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.006.query.sqlpp
new file mode 100644
index 0000000..4d08392
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.006.query.sqlpp
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- ASTERIXDB-3169 (related)
+SELECT VALUE c
+FROM ColumnDataset c
+ORDER BY c.id;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.007.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.007.update.sqlpp
new file mode 100644
index 0000000..d8e4936
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.007.update.sqlpp
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- All coordinates are of type BIGINT
+COMPACT DATASET ColumnDataset;
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.008.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.008.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.008.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.009.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.009.query.sqlpp
new file mode 100644
index 0000000..83e8d32
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/003/003.009.query.sqlpp
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+SELECT VALUE c
+FROM ColumnDataset c
+ORDER BY c.id;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.001.ddl.sqlpp
new file mode 100644
index 0000000..06d2d97
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.001.ddl.sqlpp
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+DROP DATAVERSE test if exists;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE ColumnType AS {
+    id: int
+};
+
+CREATE DATASET ColumnDataset(ColumnType)
+PRIMARY KEY id WITH {
+    "storage-format": {"format" : "column"}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.002.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.002.update.sqlpp
new file mode 100644
index 0000000..7110bf9
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.002.update.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- All coordinates are of type BIGINT
+INSERT INTO ColumnDataset (
+    {"id": 1, "geo" : {"coordinates": [1, 2]}},
+    {"id": 2, "geo" : {"coordinates": [3, 4]}},
+    {"id": 3, "geo" : {"coordinates": [5, 6]}},
+    {"id": 4, "geo" : {"coordinates": [7, 8]}}
+);
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.003.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.003.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.003.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.004.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.004.update.sqlpp
new file mode 100644
index 0000000..ce8b675
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.004.update.sqlpp
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- Now, coordinates is of type union(BIGINT, [union(DOUBLE, BIGINT)])
+INSERT INTO ColumnDataset (
+    {"id": 5, "geo" : {"coordinates": [9, [2.1]]}},
+    {"id": 6, "geo" : {"coordinates": [10, 11]}},
+    {"id": 7, "geo" : {"coordinates": [12, 13]}},
+    {"id": 8, "geo" : {"coordinates": [14, [15]]}}
+);
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.005.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.005.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.005.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.006.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.006.query.sqlpp
new file mode 100644
index 0000000..83e8d32
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.006.query.sqlpp
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+SELECT VALUE c
+FROM ColumnDataset c
+ORDER BY c.id;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.007.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.007.update.sqlpp
new file mode 100644
index 0000000..d8e4936
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.007.update.sqlpp
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+-- All coordinates are of type BIGINT
+COMPACT DATASET ColumnDataset;
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.008.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.008.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.008.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.009.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.009.query.sqlpp
new file mode 100644
index 0000000..83e8d32
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/assembly/004/004.009.query.sqlpp
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+USE test;
+
+SELECT VALUE c
+FROM ColumnDataset c
+ORDER BY c.id;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/upsert/002/002.011.get.http b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/upsert/002/002.011.get.http
new file mode 100644
index 0000000..57d830a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/upsert/002/002.011.get.http
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/connector?dataverseName=test&datasetName=ColumnDataset
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/upsert/002/002.011.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/upsert/002/002.012.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/upsert/002/002.011.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/upsert/002/002.012.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/assembly.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/001/001.003.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/assembly.003.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/001/001.003.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/assembly.004.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/001/001.004.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/assembly.004.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/001/001.004.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/assembly.005.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/001/001.005.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/assembly.005.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/001/001.005.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/assembly.006.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/001/001.006.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/assembly.006.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/001/001.006.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.003.adm
new file mode 100644
index 0000000..ea6115b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.003.adm
@@ -0,0 +1 @@
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.005.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.005.adm
new file mode 100644
index 0000000..ea6115b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.005.adm
@@ -0,0 +1 @@
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.006.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.006.adm
new file mode 100644
index 0000000..21cd780
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.006.adm
@@ -0,0 +1,8 @@
+{ "id": 1, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 2, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 3, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 4, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 5, "geo": { "coordinates": [ 1, 2.1 ] } }
+{ "id": 6, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 7, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 8, "geo": { "coordinates": [ 1, 2 ] } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.008.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.008.adm
new file mode 100644
index 0000000..ea6115b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.008.adm
@@ -0,0 +1 @@
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.009.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.009.adm
new file mode 100644
index 0000000..21cd780
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.009.adm
@@ -0,0 +1,8 @@
+{ "id": 1, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 2, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 3, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 4, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 5, "geo": { "coordinates": [ 1, 2.1 ] } }
+{ "id": 6, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 7, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 8, "geo": { "coordinates": [ 1, 2 ] } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.003.adm
new file mode 100644
index 0000000..ea6115b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.003.adm
@@ -0,0 +1 @@
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.005.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.005.adm
new file mode 100644
index 0000000..ea6115b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.005.adm
@@ -0,0 +1 @@
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.006.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.006.adm
new file mode 100644
index 0000000..00457b1
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.006.adm
@@ -0,0 +1,8 @@
+{ "id": 1, "geo": { "coordinates": [ { "lon": 1 } ] } }
+{ "id": 2, "geo": { "coordinates": [ { "lon": 2 } ] } }
+{ "id": 3, "geo": { "coordinates": [ { "lon": 3 } ] } }
+{ "id": 4, "geo": { "coordinates": [ { "lon": 4 } ] } }
+{ "id": 5, "geo": { "coordinates": [ { "lon": [ 5.1 ], "lat": 1 } ] } }
+{ "id": 6, "geo": { "coordinates": [ { "lon": [ 6 ], "lat": 2 } ] } }
+{ "id": 7, "geo": { "coordinates": [ { "lon": 7, "lat": 3 } ] } }
+{ "id": 8, "geo": { "coordinates": [ { "lat": 4 } ] } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.008.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.008.adm
new file mode 100644
index 0000000..ea6115b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.008.adm
@@ -0,0 +1 @@
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.009.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.009.adm
new file mode 100644
index 0000000..00457b1
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.009.adm
@@ -0,0 +1,8 @@
+{ "id": 1, "geo": { "coordinates": [ { "lon": 1 } ] } }
+{ "id": 2, "geo": { "coordinates": [ { "lon": 2 } ] } }
+{ "id": 3, "geo": { "coordinates": [ { "lon": 3 } ] } }
+{ "id": 4, "geo": { "coordinates": [ { "lon": 4 } ] } }
+{ "id": 5, "geo": { "coordinates": [ { "lon": [ 5.1 ], "lat": 1 } ] } }
+{ "id": 6, "geo": { "coordinates": [ { "lon": [ 6 ], "lat": 2 } ] } }
+{ "id": 7, "geo": { "coordinates": [ { "lon": 7, "lat": 3 } ] } }
+{ "id": 8, "geo": { "coordinates": [ { "lat": 4 } ] } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.003.adm
new file mode 100644
index 0000000..ea6115b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.003.adm
@@ -0,0 +1 @@
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.005.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.005.adm
new file mode 100644
index 0000000..ea6115b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.005.adm
@@ -0,0 +1 @@
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.006.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.006.adm
new file mode 100644
index 0000000..c36e987
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.006.adm
@@ -0,0 +1,8 @@
+{ "id": 1, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 2, "geo": { "coordinates": [ 3, 4 ] } }
+{ "id": 3, "geo": { "coordinates": [ 5, 6 ] } }
+{ "id": 4, "geo": { "coordinates": [ 7, 8 ] } }
+{ "id": 5, "geo": { "coordinates": [ 9, [ 2.1 ] ] } }
+{ "id": 6, "geo": { "coordinates": [ 10, 11 ] } }
+{ "id": 7, "geo": { "coordinates": [ 12, 13 ] } }
+{ "id": 8, "geo": { "coordinates": [ 14, [ 15 ] ] } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.008.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.008.adm
new file mode 100644
index 0000000..ea6115b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.008.adm
@@ -0,0 +1 @@
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.009.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.009.adm
new file mode 100644
index 0000000..c36e987
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.009.adm
@@ -0,0 +1,8 @@
+{ "id": 1, "geo": { "coordinates": [ 1, 2 ] } }
+{ "id": 2, "geo": { "coordinates": [ 3, 4 ] } }
+{ "id": 3, "geo": { "coordinates": [ 5, 6 ] } }
+{ "id": 4, "geo": { "coordinates": [ 7, 8 ] } }
+{ "id": 5, "geo": { "coordinates": [ 9, [ 2.1 ] ] } }
+{ "id": 6, "geo": { "coordinates": [ 10, 11 ] } }
+{ "id": 7, "geo": { "coordinates": [ 12, 13 ] } }
+{ "id": 8, "geo": { "coordinates": [ 14, [ 15 ] ] } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.011.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.011.adm
index 606b98a..ea6115b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.011.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.011.adm
@@ -1,5 +1 @@
-{ "id": 10, "a": [ 100, 100, 100, 100 ] }
-{ "id": 20, "a": [ 3, 4 ] }
-{ "id": 30, "a": [ 5, 6 ] }
-{ "id": 40, "a": [ 7, 8 ] }
-{ "id": 50, "a": [ 9, 10 ] }
+{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_1/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_2/test/ColumnDataset/0/ColumnDataset"},{"ip":"127.0.0.1","path":"storage/partition_3/test/ColumnDataset/0/ColumnDataset"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.012.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.012.adm
new file mode 100644
index 0000000..606b98a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.012.adm
@@ -0,0 +1,5 @@
+{ "id": 10, "a": [ 100, 100, 100, 100 ] }
+{ "id": 20, "a": [ 3, 4 ] }
+{ "id": 30, "a": [ 5, 6 ] }
+{ "id": 40, "a": [ 7, 8 ] }
+{ "id": 50, "a": [ 9, 10 ] }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index a76f1fd..2792f91 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -16086,8 +16086,23 @@
   </test-group>
   <test-group name="column">
     <test-case FilePath="column">
-      <compilation-unit name="assembly">
-        <output-dir compare="Text">assembly</output-dir>
+      <compilation-unit name="assembly/001">
+        <output-dir compare="Text">assembly/001</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="column">
+      <compilation-unit name="assembly/002">
+        <output-dir compare="Text">assembly/002</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="column">
+      <compilation-unit name="assembly/003">
+        <output-dir compare="Text">assembly/003</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="column">
+      <compilation-unit name="assembly/004">
+        <output-dir compare="Text">assembly/004</output-dir>
       </compilation-unit>
     </test-case>
     <test-case FilePath="column">
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AbstractPrimitiveValueAssembler.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AbstractPrimitiveValueAssembler.java
index 5e2ef28..0d7c9c88 100644
--- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AbstractPrimitiveValueAssembler.java
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AbstractPrimitiveValueAssembler.java
@@ -81,14 +81,18 @@
         return reader.getColumnIndex();
     }
 
-    public final void skip(int count) throws HyracksDataException {
+    public void skip(int count) throws HyracksDataException {
         reader.skip(count);
     }
 
+    public boolean isEndOfGroupAssembler() {
+        return false;
+    }
+
     /**
      * Move to the next primitive value assembler
      *
      * @return the index of the next value
      */
-    public abstract int next() throws HyracksDataException;
+    public abstract int next(AssemblerState state) throws HyracksDataException;
 }
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerBuilderVisitor.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerBuilderVisitor.java
index 969a091..2a29a70 100644
--- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerBuilderVisitor.java
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerBuilderVisitor.java
@@ -56,6 +56,7 @@
 
     //Recursion info
     private final IntList delimiters;
+    private RepeatedPrimitiveValueAssembler delegateAssembler;
     private int level;
 
     public AssemblerBuilderVisitor(QueryColumnMetadata columnMetadata, IColumnValuesReaderFactory readerFactory,
@@ -67,13 +68,13 @@
         delimiters = new IntArrayList();
     }
 
-    public List<AbstractPrimitiveValueAssembler> createValueAssemblers(AbstractSchemaNode requestedSchema,
+    public AbstractPrimitiveValueAssembler[] createValueAssemblers(AbstractSchemaNode requestedSchema,
             ARecordType declaredType) throws HyracksDataException {
         EmptyAssembler root = new EmptyAssembler();
         AssemblerInfo info = new AssemblerInfo(declaredType, root);
         level = 0;
         rootAssembler = requestedSchema.accept(this, info);
-        return valueAssemblers;
+        return valueAssemblers.toArray(new AbstractPrimitiveValueAssembler[0]);
     }
 
     public AbstractValueAssembler getRootAssembler() {
@@ -147,17 +148,28 @@
         delimiters.add(level - 1);
         level++;
 
+        RepeatedPrimitiveValueAssembler previousDelegate = delegateAssembler;
+        delegateAssembler = null;
+
         IAType itemDeclaredType = getChildType(itemNode, declaredType.getItemType());
         AssemblerInfo itemInfo = new AssemblerInfo(itemDeclaredType, arrayAssembler, false);
         itemNode.accept(this, itemInfo);
 
-        //Add the array assembler to the last repeated value assembler
-        RepeatedPrimitiveValueAssembler repeatedAssembler =
-                (RepeatedPrimitiveValueAssembler) valueAssemblers.get(valueAssemblers.size() - 1);
-        repeatedAssembler.addArray(arrayAssembler);
+        // Set repeated assembler as a delegate (responsible for writing null values)
+        delegateAssembler.setAsDelegate();
+        IColumnValuesReader reader = delegateAssembler.getReader();
+        int numberOfDelimiters = reader.getNumberOfDelimiters();
+        // End of group assembler is responsible to finalize array/multiset builders
+        EndOfRepeatedGroupAssembler endOfGroupAssembler =
+                new EndOfRepeatedGroupAssembler(reader, arrayAssembler, numberOfDelimiters - delimiters.size());
+        valueAssemblers.add(endOfGroupAssembler);
 
         level--;
         delimiters.removeInt(delimiters.size() - 1);
+        if (previousDelegate != null && !delimiters.isEmpty()) {
+            // Return the delegate assembler to the previous one
+            delegateAssembler = previousDelegate;
+        }
         return arrayAssembler;
     }
 
@@ -186,7 +198,9 @@
         if (!delimiters.isEmpty()) {
             IColumnValuesReader reader = readerFactory.createValueReader(primitiveNode.getTypeTag(),
                     primitiveNode.getColumnIndex(), level, getDelimiters());
+
             assembler = new RepeatedPrimitiveValueAssembler(level, info, reader, valueGetter);
+            setDelegate(reader, (RepeatedPrimitiveValueAssembler) assembler);
 
         } else {
             IColumnValuesReader reader = readerFactory.createValueReader(primitiveNode.getTypeTag(),
@@ -220,4 +234,12 @@
             return BuiltinType.getBuiltinType(childTypeTag);
         }
     }
+
+    private void setDelegate(IColumnValuesReader reader, RepeatedPrimitiveValueAssembler assembler) {
+        int delegateIndex =
+                delegateAssembler == null ? Integer.MAX_VALUE : delegateAssembler.getReader().getColumnIndex();
+        if (delegateIndex > reader.getColumnIndex()) {
+            delegateAssembler = assembler;
+        }
+    }
 }
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerState.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerState.java
new file mode 100644
index 0000000..a950337
--- /dev/null
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/AssemblerState.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.column.assembler;
+
+public class AssemblerState {
+    private EndOfRepeatedGroupAssembler currentGroup;
+
+    public AssemblerState() {
+        // Initially, not in a group
+        currentGroup = null;
+    }
+
+    public EndOfRepeatedGroupAssembler enterRepeatedGroup(EndOfRepeatedGroupAssembler newGroup) {
+        EndOfRepeatedGroupAssembler previousGroup = currentGroup;
+        currentGroup = newGroup;
+        return previousGroup;
+    }
+
+    public boolean isCurrentGroup(EndOfRepeatedGroupAssembler group) {
+        return currentGroup == group;
+    }
+
+    public void exitRepeatedGroup(EndOfRepeatedGroupAssembler previousGroup) {
+        currentGroup = previousGroup;
+    }
+
+    public boolean isInGroup() {
+        return currentGroup != null;
+    }
+}
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/EndOfRepeatedGroupAssembler.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/EndOfRepeatedGroupAssembler.java
new file mode 100644
index 0000000..d4c5cce
--- /dev/null
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/EndOfRepeatedGroupAssembler.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.column.assembler;
+
+import org.apache.asterix.column.assembler.value.MissingValueGetter;
+import org.apache.asterix.column.values.IColumnValuesReader;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+
+public class EndOfRepeatedGroupAssembler extends AbstractPrimitiveValueAssembler {
+    //    private final List<ArrayValueAssembler> arrays;
+    private final ArrayValueAssembler arrayAssembler;
+    private final int delimiterIndex;
+    private EndOfRepeatedGroupAssembler previousGroup;
+
+    EndOfRepeatedGroupAssembler(IColumnValuesReader reader, ArrayValueAssembler arrayAssembler, int delimiterIndex) {
+        super(reader.getLevel(), new AssemblerInfo(), reader, MissingValueGetter.INSTANCE);
+        this.arrayAssembler = arrayAssembler;
+        this.delimiterIndex = delimiterIndex;
+        previousGroup = null;
+    }
+
+    @Override
+    public int next(AssemblerState state) throws HyracksDataException {
+        // Get the current delimiter index from the reader
+        int delimiterIndex = reader.getDelimiterIndex();
+        /*
+         * Check if this "Group Ender" is relevant in this round -- meaning if the 'arrayAssembler' is actively
+         * accepting items (i.e., the 'arrayAssembler' is not NULL or MISSING)
+         */
+        if (delimiterIndex > this.delimiterIndex) {
+            // The group ender is not relevant, check if it is a delegate for an upper nesting level
+            if (arrayAssembler.isDelegate()) {
+                // Yes it is a delegate, end the arrayAssembler to signal to the parent assembler to finalize
+                arrayAssembler.end();
+            }
+            // Move ot the next assembler
+            return NEXT_ASSEMBLER;
+        }
+
+        // Initially, we are assuming to go to the next assembler
+        int nextIndex = NEXT_ASSEMBLER;
+        // Is it the end of this group?
+        if (reader.isDelimiter() && delimiterIndex == this.delimiterIndex) {
+            // Yes, end 'arrayAssembler'
+            arrayAssembler.end();
+            // And exit from this group and move to the next assembler
+            state.exitRepeatedGroup(previousGroup);
+        } else {
+            // No, return to the first value of the group
+            nextIndex = arrayAssembler.getFirstValueIndex();
+            if (!state.isCurrentGroup(this)) {
+                // Set the group delimiterIndex to indicate we are iterating over a group now (i.e., not the first round)
+                previousGroup = state.enterRepeatedGroup(this);
+            }
+        }
+        return nextIndex;
+    }
+
+    @Override
+    public boolean isEndOfGroupAssembler() {
+        return true;
+    }
+
+    @Override
+    public void skip(int count) throws HyracksDataException {
+        // noOp
+    }
+}
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/PrimitiveValueAssembler.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/PrimitiveValueAssembler.java
index 4f7778c..eb88778 100644
--- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/PrimitiveValueAssembler.java
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/PrimitiveValueAssembler.java
@@ -29,9 +29,9 @@
     }
 
     @Override
-    public int next() throws HyracksDataException {
+    public int next(AssemblerState state) throws HyracksDataException {
         if (!reader.next()) {
-            throw new IllegalAccessError("no more values, column index: " + getColumnIndex());
+            throw new IllegalStateException("no more values, column index: " + getColumnIndex());
         } else if (reader.isNull() && (isDelegate() || reader.getLevel() + 1 == level)) {
             addNullToAncestor(reader.getLevel());
         } else if (reader.isValue()) {
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/RepeatedPrimitiveValueAssembler.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/RepeatedPrimitiveValueAssembler.java
index d4455ec..a10fc61 100644
--- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/RepeatedPrimitiveValueAssembler.java
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/assembler/RepeatedPrimitiveValueAssembler.java
@@ -18,36 +18,58 @@
  */
 package org.apache.asterix.column.assembler;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.asterix.column.assembler.value.IValueGetter;
 import org.apache.asterix.column.values.IColumnValuesReader;
 import org.apache.hyracks.api.exceptions.HyracksDataException;
 
 class RepeatedPrimitiveValueAssembler extends AbstractPrimitiveValueAssembler {
-    private final List<ArrayValueAssembler> arrays;
+    private boolean arrayDelegate;
 
     RepeatedPrimitiveValueAssembler(int level, AssemblerInfo info, IColumnValuesReader reader,
             IValueGetter primitiveValue) {
         super(level, info, reader, primitiveValue);
-        this.arrays = new ArrayList<>();
-    }
-
-    public void addArray(ArrayValueAssembler assembler) {
-        arrays.add(assembler);
+        this.arrayDelegate = false;
     }
 
     @Override
-    public int next() throws HyracksDataException {
+    public int next(AssemblerState state) throws HyracksDataException {
+        /*
+         * Move to the next value if one of the following is true
+         * - It is the first time we access this assembler (i.e., the first round)
+         * - We are in an array (i.e., the parent array assembler is active)
+         * - The value is a delimiter (i.e., the last round)
+         */
+        if (!state.isInGroup() || reader.isRepeatedValue() || reader.isDelimiter()) {
+            next();
+        }
+
+        if (isDelegate()) {
+            // Indicate to parent that it is the end
+            getParent().end();
+        }
+
+        //Go to next assembler
+        return NEXT_ASSEMBLER;
+    }
+
+    public IColumnValuesReader getReader() {
+        return reader;
+    }
+
+    public void setAsDelegate() {
+        // This assembler is responsible for adding null values
+        this.arrayDelegate = true;
+    }
+
+    private void next() throws HyracksDataException {
         if (!reader.next()) {
-            throw new IllegalAccessError("no more values, column index: " + getColumnIndex());
-        } else if (reader.isNull() && (!arrays.isEmpty() || reader.getLevel() + 1 == level)) {
+            throw new IllegalStateException("no more values, column index: " + getColumnIndex());
+        } else if (reader.isNull() && (arrayDelegate || reader.getLevel() + 1 == level)) {
             /*
              * There are two cases here for where the null belongs to:
              * 1- If the null is an array item, then add it
              * 2- If the null is an ancestor, then we only add null if this column is the array delegate
-             * (i.e., !arrays.isEmpty())
+             * (i.e., arrayDelegate is true)
              */
             addNullToAncestor(reader.getLevel());
         } else if (reader.isMissing() && reader.getLevel() + 1 == level) {
@@ -58,39 +80,5 @@
         } else if (reader.isValue()) {
             addValueToParent();
         }
-
-        if (isDelegate()) {
-            getParent().end();
-        }
-
-        //Initially, go to the next primitive assembler
-        int nextIndex = NEXT_ASSEMBLER;
-        if (!arrays.isEmpty()) {
-            /*
-             * This assembler is a delegate of a repeated group
-             * The delimiter index tells us that this assembler is responsible for a finished group
-             */
-            int delimiterIndex = reader.getDelimiterIndex();
-            if (delimiterIndex < arrays.size() && reader.isDelimiter()) {
-                //Also finish the next group
-                delimiterIndex++;
-            }
-
-            int numberOfFinishedGroups = Math.min(delimiterIndex, arrays.size());
-            for (int i = 0; i < numberOfFinishedGroups; i++) {
-                //I'm the delegate for this group of repeated values and the group(s) is finished
-                ArrayValueAssembler assembler = arrays.get(i);
-                assembler.end();
-            }
-
-            //Is the repeated group (determined by the delimiter index) still unfinished?
-            if (delimiterIndex < arrays.size()) {
-                //Yes, go to the first value of the unfinished repeated group
-                nextIndex = arrays.get(delimiterIndex).getFirstValueIndex();
-            }
-        }
-
-        //Go to next value
-        return nextIndex;
     }
 }
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/ColumnAssembler.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/ColumnAssembler.java
index 71d3ac6..e86f063 100644
--- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/ColumnAssembler.java
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/query/ColumnAssembler.java
@@ -18,10 +18,9 @@
  */
 package org.apache.asterix.column.operation.query;
 
-import java.util.List;
-
 import org.apache.asterix.column.assembler.AbstractPrimitiveValueAssembler;
 import org.apache.asterix.column.assembler.AssemblerBuilderVisitor;
+import org.apache.asterix.column.assembler.AssemblerState;
 import org.apache.asterix.column.assembler.ObjectValueAssembler;
 import org.apache.asterix.column.assembler.value.IValueGetterFactory;
 import org.apache.asterix.column.bytes.stream.in.AbstractBytesInputStream;
@@ -32,8 +31,9 @@
 import org.apache.hyracks.data.std.api.IValueReference;
 
 public final class ColumnAssembler {
-    private final List<AbstractPrimitiveValueAssembler> assemblers;
+    private final AbstractPrimitiveValueAssembler[] assemblers;
     private final ObjectValueAssembler rootAssembler;
+    private final AssemblerState state;
     private int numberOfTuples;
     private int tupleIndex;
 
@@ -44,6 +44,7 @@
                 new AssemblerBuilderVisitor(columnMetadata, readerFactory, valueGetterFactory);
         assemblers = builderVisitor.createValueAssemblers(node, declaredType);
         rootAssembler = (ObjectValueAssembler) builderVisitor.getRootAssembler();
+        state = new AssemblerState();
     }
 
     public void reset(int numberOfTuples) {
@@ -52,11 +53,11 @@
     }
 
     public void resetColumn(AbstractBytesInputStream stream, int ordinal) throws HyracksDataException {
-        assemblers.get(ordinal).reset(stream, numberOfTuples);
+        assemblers[ordinal].reset(stream, numberOfTuples);
     }
 
     public int getColumnIndex(int ordinal) {
-        return assemblers.get(ordinal).getColumnIndex();
+        return assemblers[ordinal].getColumnIndex();
     }
 
     public boolean hasNext() {
@@ -72,9 +73,9 @@
         }
 
         int index = 0;
-        while (index < assemblers.size()) {
-            AbstractPrimitiveValueAssembler assembler = assemblers.get(index);
-            int groupIndex = assembler.next();
+        while (index < assemblers.length) {
+            AbstractPrimitiveValueAssembler assembler = assemblers[index];
+            int groupIndex = assembler.next(state);
             if (groupIndex != AbstractPrimitiveValueAssembler.NEXT_ASSEMBLER) {
                 index = groupIndex;
             } else {
@@ -88,13 +89,13 @@
     }
 
     public int getNumberOfColumns() {
-        return assemblers.size();
+        return assemblers.length;
     }
 
     public void skip(int count) throws HyracksDataException {
         tupleIndex += count;
-        for (int i = 0; i < assemblers.size(); i++) {
-            assemblers.get(i).skip(count);
+        for (int i = 0; i < assemblers.length; i++) {
+            assemblers[i].skip(count);
         }
     }
 }
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnValuesReader.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnValuesReader.java
index fe23b23..7ec6e8a 100644
--- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnValuesReader.java
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/IColumnValuesReader.java
@@ -86,6 +86,15 @@
     boolean isDelimiter();
 
     /**
+     * @return is the last delimiter (the end of all nested arrays)
+     */
+    boolean isLastDelimiter();
+
+    boolean isRepeatedValue();
+
+    int getNumberOfDelimiters();
+
+    /**
      * @return which delimiter was returned (nested arrays have different delimiter indexes)
      */
     int getDelimiterIndex();
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/PrimitiveColumnValuesReader.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/PrimitiveColumnValuesReader.java
index 7ae2954..8fdf1b5 100644
--- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/PrimitiveColumnValuesReader.java
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/PrimitiveColumnValuesReader.java
@@ -74,6 +74,21 @@
     }
 
     @Override
+    public boolean isLastDelimiter() {
+        return false;
+    }
+
+    @Override
+    public boolean isRepeatedValue() {
+        return false;
+    }
+
+    @Override
+    public int getNumberOfDelimiters() {
+        return 0;
+    }
+
+    @Override
     public int getDelimiterIndex() {
         throw new IllegalStateException("Not a repeated reader");
     }
diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/RepeatedPrimitiveColumnValuesReader.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/RepeatedPrimitiveColumnValuesReader.java
index 1cd424b..9848878 100644
--- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/RepeatedPrimitiveColumnValuesReader.java
+++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/values/reader/RepeatedPrimitiveColumnValuesReader.java
@@ -80,6 +80,11 @@
     }
 
     @Override
+    public int getNumberOfDelimiters() {
+        return delimiters.length;
+    }
+
+    @Override
     public int getDelimiterIndex() {
         return delimiterIndex;
     }
@@ -108,11 +113,13 @@
         writer.writeLevel(level);
     }
 
-    private boolean isRepeatedValue() {
+    @Override
+    public boolean isRepeatedValue() {
         return levelToDelimiterMap[level] < delimiters.length;
     }
 
-    private boolean isLastDelimiter() {
+    @Override
+    public boolean isLastDelimiter() {
         return isDelimiter() && delimiterIndex == delimiters.length - 1;
     }
 
diff --git a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/reader/DummyPrimitiveColumnValueReader.java b/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/reader/DummyPrimitiveColumnValueReader.java
index 115f311..f888db4 100644
--- a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/reader/DummyPrimitiveColumnValueReader.java
+++ b/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/reader/DummyPrimitiveColumnValueReader.java
@@ -55,7 +55,22 @@
     }
 
     @Override
+    public boolean isLastDelimiter() {
+        return false;
+    }
+
+    @Override
+    public boolean isRepeatedValue() {
+        return false;
+    }
+
+    @Override
     public int getDelimiterIndex() {
         throw new IllegalStateException("Not a repeated reader");
     }
+
+    @Override
+    public int getNumberOfDelimiters() {
+        return 0;
+    }
 }
diff --git a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/reader/DummyRepeatedPrimitiveColumnValueReader.java b/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/reader/DummyRepeatedPrimitiveColumnValueReader.java
index abd1927..06c94c3 100644
--- a/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/reader/DummyRepeatedPrimitiveColumnValueReader.java
+++ b/asterixdb/asterix-column/src/test/java/org/apache/asterix/column/values/reader/DummyRepeatedPrimitiveColumnValueReader.java
@@ -73,10 +73,25 @@
     }
 
     @Override
+    public boolean isLastDelimiter() {
+        return isDelimiter() && delimiterIndex == delimiters.length - 1;
+    }
+
+    @Override
+    public boolean isRepeatedValue() {
+        return levelToDelimiterMap[level] < delimiters.length;
+    }
+
+    @Override
     public int getDelimiterIndex() {
         return delimiterIndex;
     }
 
+    @Override
+    public int getNumberOfDelimiters() {
+        return delimiters.length;
+    }
+
     private void consumeDelimiterIfAny() {
         if (isDelimiter()) {
             delimiterIndex++;