diff --git a/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
new file mode 100644
index 0000000..fc350a9
--- /dev/null
+++ b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
@@ -0,0 +1,68 @@
+; 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.
+
+[nc/asterix_nc1]
+txn.log.dir=target/tmp/asterix_nc1/txnlog
+core.dump.dir=target/tmp/asterix_nc1/coredump
+iodevices=asterix_nc1/iodevice1
+iodevices=asterix_nc1/iodevice2
+nc.api.port=19004
+#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006
+
+[nc/asterix_nc2]
+ncservice.port=9091
+txn.log.dir=target/tmp/asterix_nc2/txnlog
+core.dump.dir=target/tmp/asterix_nc2/coredump
+iodevices=asterix_nc2/iodevice1
+iodevices=asterix_nc2/iodevice2
+nc.api.port=19005
+#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5007
+
+[nc]
+address=127.0.0.1
+command=asterixnc
+app.class=org.apache.asterix.hyracks.bootstrap.NCApplication
+jvm.args=-Xmx4096m -Dnode.Resolver="org.apache.asterix.external.util.IdentitiyResolverFactory"
+storage.buffercache.pagesize=32KB
+storage.buffercache.size=128MB
+storage.memorycomponent.globalbudget=512MB
+storage.io.scheduler=greedy
+storage.filtered.memorycomponent.max.size=16MB
+
+[cc]
+address = 127.0.0.1
+app.class=org.apache.asterix.hyracks.bootstrap.CCApplication
+heartbeat.period=2000
+heartbeat.max.misses=25
+
+[common]
+log.dir = logs/
+log.level = INFO
+compiler.cbo=false
+compiler.cbotest=true
+compiler.queryplanshape=zigzag
+compiler.framesize=32KB
+compiler.sortmemory=320KB
+compiler.groupmemory=160KB
+compiler.joinmemory=256KB
+compiler.textsearchmemory=160KB
+compiler.windowmemory=192KB
+compiler.sort.parallel=false
+compiler.internal.sanitycheck=true
+messaging.frame.size=4096
+messaging.frame.count=512
+storage.partitioning=static
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/AnalyzingTestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/AnalyzingTestExecutor.java
index ef20c85..485e359 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/AnalyzingTestExecutor.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/AnalyzingTestExecutor.java
@@ -40,8 +40,7 @@
             Pattern.MULTILINE | Pattern.CASE_INSENSITIVE);
 
     public AnalyzingTestExecutor() {
-        super();
-        super.deltaPath = "results_cbo";
+        super("results_cbo");
     }
 
     @Override
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index 27a575f..f1d484e 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@ -279,15 +279,13 @@
     protected String deltaPath = null;
 
     public TestExecutor() {
-        this(Inet4Address.getLoopbackAddress().getHostAddress(), 19002);
+        this(Collections.singletonList(
+                InetSocketAddress.createUnresolved(Inet4Address.getLoopbackAddress().getHostAddress(), 19002)));
     }
 
-    public TestExecutor(String host, int port) {
-        this(InetSocketAddress.createUnresolved(host, port));
-    }
-
-    public TestExecutor(InetSocketAddress endpoint) {
-        this(Collections.singletonList(endpoint));
+    public TestExecutor(String resultDeltaPath) {
+        this();
+        this.deltaPath = resultDeltaPath;
     }
 
     public TestExecutor(List<InetSocketAddress> endpoints) {
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppStaticPartitioningExecutionTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppStaticPartitioningExecutionTest.java
new file mode 100644
index 0000000..868820e
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppStaticPartitioningExecutionTest.java
@@ -0,0 +1,87 @@
+/*
+ * 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.test.runtime;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.asterix.common.api.INcApplicationContext;
+import org.apache.asterix.test.common.TestExecutor;
+import org.apache.asterix.testframework.context.TestCaseContext;
+import org.apache.hyracks.control.nc.NodeControllerService;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Runs the SQL++ runtime tests with static partitioning.
+ */
+@RunWith(Parameterized.class)
+public class SqlppStaticPartitioningExecutionTest {
+
+    private static final String TEST_CONFIG_FILE_NAME = "src/main/resources/cc_static_partitioning.conf";
+    private static final String DELTA_RESULT_PATH = "results_static_partitioning";
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        final TestExecutor testExecutor = new TestExecutor(DELTA_RESULT_PATH);
+        LangExecutionUtil.setUp(TEST_CONFIG_FILE_NAME, testExecutor);
+        setNcEndpoints(testExecutor);
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        LangExecutionUtil.tearDown();
+    }
+
+    @Parameters(name = "SqlppStaticPartitioningExecutionTest {index}: {0}")
+    public static Collection<Object[]> tests() throws Exception {
+        return LangExecutionUtil.tests("only_sqlpp.xml", "testsuite_sqlpp.xml");
+    }
+
+    protected TestCaseContext tcCtx;
+
+    public SqlppStaticPartitioningExecutionTest(TestCaseContext tcCtx) {
+        this.tcCtx = tcCtx;
+    }
+
+    @Test
+    public void test() throws Exception {
+        LangExecutionUtil.test(tcCtx);
+    }
+
+    private static void setNcEndpoints(TestExecutor testExecutor) {
+        final NodeControllerService[] ncs = ExecutionTestUtil.integrationUtil.ncs;
+        final Map<String, InetSocketAddress> ncEndPoints = new HashMap<>();
+        final String ip = InetAddress.getLoopbackAddress().getHostAddress();
+        for (NodeControllerService nc : ncs) {
+            final String nodeId = nc.getId();
+            final INcApplicationContext appCtx = (INcApplicationContext) nc.getApplicationContext();
+            int apiPort = appCtx.getExternalProperties().getNcApiPort();
+            ncEndPoints.put(nodeId, InetSocketAddress.createUnresolved(ip, apiPort));
+        }
+        testExecutor.setNcEndPoints(ncEndPoints);
+    }
+}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/filter/002/002.008.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/filter/002/002.008.query.sqlpp
index 8053710..02e2a27 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/filter/002/002.008.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/filter/002/002.008.query.sqlpp
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
--- param max-warnings:json=1000
+-- param max-warnings:json=1
 USE test;
 SET `compiler.column.filter` "true";
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feed-with-filtered-dataset/feed-with-filtered-dataset.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feed-with-filtered-dataset/feed-with-filtered-dataset.3.query.sqlpp
index 697798b..8575498 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feed-with-filtered-dataset/feed-with-filtered-dataset.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feed-with-filtered-dataset/feed-with-filtered-dataset.3.query.sqlpp
@@ -25,4 +25,5 @@
 use test;
 
 select value f from  FacebookMessages f
-where f.`send-time` > datetime("2012-08-20T10:10:00");
\ No newline at end of file
+where f.`send-time` > datetime("2012-08-20T10:10:00")
+order by f.`message-id`;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-2/sugar-01-2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-2/sugar-01-2.3.query.sqlpp
index 6187e72..450d0c8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-2/sugar-01-2.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-2/sugar-01-2.3.query.sqlpp
@@ -23,4 +23,4 @@
 FROM Employee e
 GROUP BY e.deptno GROUP AS g
 SELECT e.deptno AS deptno, AVG(e.salary) AS avgpay,
-       (SELECT i.e.name AS name, i.e.salary AS salary FROM g AS i) AS workers;
+       (SELECT i.e.name AS name, i.e.salary AS salary FROM g AS i ORDER BY i.e.name) AS workers;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/misc_01/misc_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/misc_01/misc_01.2.update.sqlpp
index 21fd00e..db12a0e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/misc_01/misc_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/misc_01/misc_01.2.update.sqlpp
@@ -23,11 +23,9 @@
 
 use test;
 
-set `import-private-functions` `true`;
-
 insert into t1
 select element { "c1":1, "c2": 1, "one": 1 };
 
 insert into t1
 select v c1, v c2, 1 one
-from range(2, (select value count(*) from storage_components("test","t1") t)[0]) v;
+from range(2, 4) v;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/ntile_01/ntile_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/ntile_01/ntile_01.2.update.sqlpp
index 6286e28..f6c037c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/ntile_01/ntile_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/ntile_01/ntile_01.2.update.sqlpp
@@ -23,14 +23,12 @@
 
 use test;
 
-set `import-private-functions` `true`;
-
 insert into t1
 select element { "c1":1, "c2": 1, "one": 1 };
 
 insert into t1
 select v c1, v c2, 1 one
-from range(2, (select value count(*) from storage_components("test","t1") t)[0]) v;
+from range(2, 4) v;
 
 insert into tRnd
 select 1 c1, random() rnd;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/percent_rank_01/percent_rank_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/percent_rank_01/percent_rank_01.2.update.sqlpp
index 5c6d500..d213fdf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/percent_rank_01/percent_rank_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/percent_rank_01/percent_rank_01.2.update.sqlpp
@@ -30,7 +30,7 @@
 
 insert into t1
 select v c1, v c2, 1 one
-from range(2, (select value count(*) from storage_components("test","t1") t)[0]) v;
+from range(2, 4) v;
 
 insert into tRnd
 select 1 c1, random() rnd;
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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.003.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ 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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.005.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.005.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.005.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.008.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.008.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.008.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/002/002.008.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.003.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ 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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.005.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.005.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.005.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.008.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.008.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.008.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/003/003.008.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.003.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ 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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.005.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.005.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.005.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.008.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.008.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.008.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/assembly/004/004.008.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/big-object/big-object.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/big-object/big-object.3.adm
deleted file mode 100644
index a6f80d1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/big-object/big-object.3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}}]},"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/big-object/big-object.3.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/big-object/big-object.3.regexadm
new file mode 100644
index 0000000..401eab4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/big-object/big-object.3.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.003.adm
deleted file mode 100644
index 2233601..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","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/delete/001/001.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.003.regexadm
new file mode 100644
index 0000000..9f1dc3a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.007.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.007.adm
deleted file mode 100644
index 2233601..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.007.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","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/delete/001/001.007.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.007.regexadm
new file mode 100644
index 0000000..9f1dc3a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/001/001.007.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.003.adm
deleted file mode 100644
index 2233601..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","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/delete/002/002.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.003.regexadm
new file mode 100644
index 0000000..9f1dc3a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.007.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.007.adm
deleted file mode 100644
index 2233601..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.007.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","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/delete/002/002.007.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.007.regexadm
new file mode 100644
index 0000000..9f1dc3a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/delete/002/002.007.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.003.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/filter/001/001.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.003.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.005.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.005.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.005.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/filter/001/001.005.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.005.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/001/001.005.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.003.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/filter/002/002.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.003.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.005.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.005.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.005.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/filter/002/002.005.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.005.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.005.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.007.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.007.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.007.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/filter/002/002.007.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.007.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/002/002.007.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/003/003.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/003/003.003.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/003/003.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/filter/003/003.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/003/003.003.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/003/003.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_after_gby/meta_after_gby.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_after_gby/meta_after_gby.3.adm
deleted file mode 100644
index d37b3ac..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_after_gby/meta_after_gby.3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS/0/DS"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_after_gby/meta_after_gby.3.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_after_gby/meta_after_gby.3.regexadm
new file mode 100644
index 0000000..d52948f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_after_gby/meta_after_gby.3.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.3.adm
deleted file mode 100644
index d37b3ac..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS/0/DS"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.3.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.3.regexadm
new file mode 100644
index 0000000..d52948f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.3.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.4.adm
deleted file mode 100644
index c649944..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.4.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS2/0/DS2"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS2/0/DS2"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS2/0/DS2"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS2/0/DS2"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.4.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.4.regexadm
new file mode 100644
index 0000000..d52948f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/meta_in_with_clause/meta_in_with_clause.4.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.3.adm
deleted file mode 100644
index d37b3ac..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS/0/DS"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.3.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.3.regexadm
new file mode 100644
index 0000000..d52948f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.3.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.4.adm
deleted file mode 100644
index c649944..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.4.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS2/0/DS2"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS2/0/DS2"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS2/0/DS2"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS2/0/DS2"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.4.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.4.regexadm
new file mode 100644
index 0000000..d52948f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/meta/resolving_pk_with_meta/resolving_pk_with_meta.4.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"id":{"type":"AInt64"}},{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/002/002.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/002/002.003.adm
deleted file mode 100644
index 2233601..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/002/002.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","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/missing-null-values/002/002.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/002/002.003.regexadm
new file mode 100644
index 0000000..9f1dc3a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/002/002.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/003/003.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/003/003.003.adm
deleted file mode 100644
index 2233601..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/003/003.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","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/missing-null-values/003/003.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/003/003.003.regexadm
new file mode 100644
index 0000000..9f1dc3a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/003/003.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/005/005.004.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/005/005.004.adm
deleted file mode 100644
index 2233601..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/005/005.004.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","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/missing-null-values/005/005.004.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/005/005.004.regexadm
new file mode 100644
index 0000000..9f1dc3a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/005/005.004.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/006/006.004.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/006/006.004.adm
deleted file mode 100644
index 2233601..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/006/006.004.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","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/missing-null-values/006/006.004.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/006/006.004.regexadm
new file mode 100644
index 0000000..9f1dc3a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/missing-null-values/006/006.004.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OpenType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.04.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.04.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.04.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.04.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.04.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.04.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.08.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.08.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.08.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.08.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.08.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.08.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.12.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.12.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.12.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.12.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.12.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-1/use-case-1.12.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.04.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.04.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.04.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.04.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.04.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.04.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.08.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.08.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.08.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.08.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.08.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.08.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.12.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.12.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.12.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.12.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.12.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-2/use-case-2.12.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.04.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.04.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.04.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.04.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.04.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.04.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.08.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.08.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.08.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.08.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.08.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.08.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.12.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.12.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.12.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.12.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.12.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-3/use-case-3.12.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.04.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.04.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.04.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.04.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.04.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.04.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.08.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.08.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.08.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.08.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.08.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.08.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.12.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.12.adm
deleted file mode 100644
index f9dd3d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.12.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.12.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.12.regexadm
new file mode 100644
index 0000000..7f7e0cd
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/use-case-4/use-case-4.12.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"business_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"business_id":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.04.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.04.adm
deleted file mode 100644
index e9774d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.04.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.04.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.04.regexadm
new file mode 100644
index 0000000..980ba38
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.04.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.08.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.08.adm
deleted file mode 100644
index e9774d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.08.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.08.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.08.regexadm
new file mode 100644
index 0000000..980ba38
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.08.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.12.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.12.adm
deleted file mode 100644
index e9774d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.12.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.12.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.12.regexadm
new file mode 100644
index 0000000..980ba38
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-additional-atomic-index/with-additional-atomic-index.12.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.04.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.04.adm
deleted file mode 100644
index e9774d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.04.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.04.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.04.regexadm
new file mode 100644
index 0000000..980ba38
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.04.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.08.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.08.adm
deleted file mode 100644
index e9774d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.08.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.08.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.08.regexadm
new file mode 100644
index 0000000..980ba38
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.08.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.12.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.12.adm
deleted file mode 100644
index e9774d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.12.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_1/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_2/TestYelp/YelpCheckin/0/YelpCheckin"},{"ip":"127.0.0.1","path":"storage/partition_3/TestYelp/YelpCheckin/0/YelpCheckin"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.12.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.12.regexadm
new file mode 100644
index 0000000..980ba38
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/array-index/with-composite-sk/with-composite-sk.12.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"checkin_id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"CheckinType","open":true,"fields":[{"checkin_id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.003.adm
deleted file mode 100644
index c7dc23c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.003.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS/0/DS"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.003.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.003.regexadm
new file mode 100644
index 0000000..bd4ca03
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.003.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.008.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.008.adm
deleted file mode 100644
index c7dc23c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.008.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS/0/DS"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.008.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.008.regexadm
new file mode 100644
index 0000000..bd4ca03
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.008.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.012.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.012.adm
deleted file mode 100644
index c7dc23c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.012.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS/0/DS"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.012.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.012.regexadm
new file mode 100644
index 0000000..bd4ca03
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/create-index/after-upsert-with-meta/after-upsert-with-meta.012.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.011.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.011.adm
deleted file mode 100644
index c7dc23c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.011.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS/0/DS"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.011.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.011.regexadm
new file mode 100644
index 0000000..bd4ca03
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.011.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.023.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.023.adm
deleted file mode 100644
index c7dc23c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.023.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DS/0/DS"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DS/0/DS"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.023.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.023.regexadm
new file mode 100644
index 0000000..bd4ca03
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/secondary-index/index-with-meta/index-with-meta.023.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DataType","open":true,"fields":[{"name":{"type":"AString"}},{"age":{"type":"AInt64"}},{"hobby":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.004.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.004.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.004.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/001/upsert.004.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.004.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.004.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.008.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.008.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.008.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/001/upsert.008.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.008.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.008.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.012.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.012.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.012.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/001/upsert.012.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.012.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.012.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.015.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.015.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.015.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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/001/upsert.015.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.015.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/001/upsert.015.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.004.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.004.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.004.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.004.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.004.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.004.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.008.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.008.adm
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.008.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.008.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.008.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.008.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
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
deleted file mode 100644
index ea6115b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.011.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"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.011.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.011.regexadm
new file mode 100644
index 0000000..81882d4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/upsert/002/upsert.011.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"ColumnType","open":true,"fields":[{"id":{"type":"AInt64"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key.4.adm
deleted file mode 100644
index 9671834..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key.4.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DBLPType","open":false,"fields":[{"id":{"type":"AString"}},{"dblpid":{"type":"AString"}},{"title":{"type":"org.apache.asterix.om.types.AUnionType","fields":[{"type":"AString"},{"type":"ANULL"},{"type":"AMISSING"}]}},{"authors":{"type":"AString"}},{"misc":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DBLP/0/DBLP"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key.4.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key.4.regexadm
new file mode 100644
index 0000000..da93fd6
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-nullable-string-as-primary-key.4.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DBLPType","open":false,"fields":[{"id":{"type":"AString"}},{"dblpid":{"type":"AString"}},{"title":{"type":"org.apache.asterix.om.types.AUnionType","fields":[{"type":"AString"},{"type":"ANULL"},{"type":"AMISSING"}]}},{"authors":{"type":"AString"}},{"misc":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key.4.adm
deleted file mode 100644
index e5d5f6e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key.4.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DBLPType","open":false,"fields":[{"id":{"type":"AString"}},{"dblpid":{"type":"AString"}},{"title":{"type":"AString"}},{"authors":{"type":"AString"}},{"misc":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DBLP/0/DBLP"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key.4.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key.4.regexadm
new file mode 100644
index 0000000..c00793a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key/scan-insert-inverted-index-ngram-secondary-index-string-as-primary-key.4.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DBLPType","open":false,"fields":[{"id":{"type":"AString"}},{"dblpid":{"type":"AString"}},{"title":{"type":"AString"}},{"authors":{"type":"AString"}},{"misc":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-word-secondary-index-string-as-primary-key/scan-insert-inverted-index-word-secondary-index-string-as-primary-key.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-word-secondary-index-string-as-primary-key/scan-insert-inverted-index-word-secondary-index-string-as-primary-key.4.adm
deleted file mode 100644
index e5d5f6e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-word-secondary-index-string-as-primary-key/scan-insert-inverted-index-word-secondary-index-string-as-primary-key.4.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DBLPType","open":false,"fields":[{"id":{"type":"AString"}},{"dblpid":{"type":"AString"}},{"title":{"type":"AString"}},{"authors":{"type":"AString"}},{"misc":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_1/test/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_2/test/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_3/test/DBLP/0/DBLP"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-word-secondary-index-string-as-primary-key/scan-insert-inverted-index-word-secondary-index-string-as-primary-key.4.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-word-secondary-index-string-as-primary-key/scan-insert-inverted-index-word-secondary-index-string-as-primary-key.4.regexadm
new file mode 100644
index 0000000..c00793a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/dml/scan-insert-inverted-index-word-secondary-index-string-as-primary-key/scan-insert-inverted-index-word-secondary-index-string-as-primary-key.4.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DBLPType","open":false,"fields":[{"id":{"type":"AString"}},{"dblpid":{"type":"AString"}},{"title":{"type":"AString"}},{"authors":{"type":"AString"}},{"misc":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feed-with-filtered-dataset/feed-with-filtered-dataset.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feed-with-filtered-dataset/feed-with-filtered-dataset.1.adm
index 09abbcc..b5b9fbd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feed-with-filtered-dataset/feed-with-filtered-dataset.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feed-with-filtered-dataset/feed-with-filtered-dataset.1.adm
@@ -1,7 +1,7 @@
-{ "message-id": 11, "author-id": 1, "in-response-to": 1, "sender-location": point("38.97,77.49"), "message": " can't stand at&t its plan is terrible", "send-time": datetime("2012-11-20T10:10:00.000") }
-{ "message-id": 12, "author-id": 10, "in-response-to": 6, "sender-location": point("42.26,77.76"), "message": " can't stand t-mobile its voicemail-service is OMG:(", "send-time": datetime("2012-12-20T10:10:00.000") }
-{ "message-id": 14, "author-id": 9, "in-response-to": 12, "sender-location": point("41.33,85.28"), "message": " love at&t its 3G is good:)", "send-time": datetime("2013-09-20T10:10:00.000") }
-{ "message-id": 13, "author-id": 10, "in-response-to": 4, "sender-location": point("42.77,78.92"), "message": " dislike iphone the voice-command is bad:(", "send-time": datetime("2013-08-20T10:10:00.000") }
-{ "message-id": 15, "author-id": 7, "in-response-to": 11, "sender-location": point("44.47,67.11"), "message": " like iphone the voicemail-service is awesome", "send-time": datetime("2014-01-20T10:10:00.000") }
 { "message-id": 9, "author-id": 3, "in-response-to": 12, "sender-location": point("34.45,96.48"), "message": " love verizon its wireless is good", "send-time": datetime("2012-09-20T10:10:00.000") }
 { "message-id": 10, "author-id": 1, "in-response-to": 12, "sender-location": point("42.5,70.01"), "message": " can't stand motorola the touch-screen is terrible", "send-time": datetime("2012-10-20T10:10:00.000") }
+{ "message-id": 11, "author-id": 1, "in-response-to": 1, "sender-location": point("38.97,77.49"), "message": " can't stand at&t its plan is terrible", "send-time": datetime("2012-11-20T10:10:00.000") }
+{ "message-id": 12, "author-id": 10, "in-response-to": 6, "sender-location": point("42.26,77.76"), "message": " can't stand t-mobile its voicemail-service is OMG:(", "send-time": datetime("2012-12-20T10:10:00.000") }
+{ "message-id": 13, "author-id": 10, "in-response-to": 4, "sender-location": point("42.77,78.92"), "message": " dislike iphone the voice-command is bad:(", "send-time": datetime("2013-08-20T10:10:00.000") }
+{ "message-id": 14, "author-id": 9, "in-response-to": 12, "sender-location": point("41.33,85.28"), "message": " love at&t its 3G is good:)", "send-time": datetime("2013-09-20T10:10:00.000") }
+{ "message-id": 15, "author-id": 7, "in-response-to": 11, "sender-location": point("44.47,67.11"), "message": " like iphone the voicemail-service is awesome", "send-time": datetime("2014-01-20T10:10:00.000") }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-string-as-primary-key/dblp-string-as-primary-key.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-string-as-primary-key/dblp-string-as-primary-key.3.adm
deleted file mode 100644
index c08b4db..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-string-as-primary-key/dblp-string-as-primary-key.3.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DBLPType","open":true,"fields":[{"id":{"type":"AString"}},{"dblpid":{"type":"AString"}},{"title":{"type":"AString"}},{"authors":{"type":"AString"}},{"misc":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/fuzzyjoin/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_1/fuzzyjoin/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_2/fuzzyjoin/DBLP/0/DBLP"},{"ip":"127.0.0.1","path":"storage/partition_3/fuzzyjoin/DBLP/0/DBLP"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-string-as-primary-key/dblp-string-as-primary-key.3.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-string-as-primary-key/dblp-string-as-primary-key.3.regexadm
new file mode 100644
index 0000000..af5f249
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fuzzyjoin/dblp-string-as-primary-key/dblp-string-as-primary-key.3.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"id","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"DBLPType","open":true,"fields":[{"id":{"type":"AString"}},{"dblpid":{"type":"AString"}},{"title":{"type":"AString"}},{"authors":{"type":"AString"}},{"misc":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/batch-lookup/batch-lookup.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/batch-lookup/batch-lookup.4.adm
deleted file mode 100644
index a5501c7..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/batch-lookup/batch-lookup.4.adm
+++ /dev/null
@@ -1 +0,0 @@
-{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/test/LineItem/0/LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/test/LineItem/0/LineItem"},{"ip":"127.0.0.1","path":"storage/partition_2/test/LineItem/0/LineItem"},{"ip":"127.0.0.1","path":"storage/partition_3/test/LineItem/0/LineItem"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/batch-lookup/batch-lookup.4.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/batch-lookup/batch-lookup.4.regexadm
new file mode 100644
index 0000000..b23fbeb
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/batch-lookup/batch-lookup.4.regexadm
@@ -0,0 +1 @@
+\Q{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[\E.*\Q]}\E
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.2.ast
index b016508..916a59e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.2.ast
@@ -1,2 +1 @@
 DataverseUse test
-Set import-private-functions=true
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.14.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.14.adm
new file mode 100644
index 0000000..59b43e7
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.14.adm
@@ -0,0 +1 @@
+{ "metadata": { "DatasetName": "ds1", "IndexName": "sample_idx_1_ds1", "SampleCardinalityTarget": 4252, "SourceCardinality": 4400, "SourceAvgItemSize": true, "SampleSeed": true }, "stats": { "cnt": 4248, "min_pk": true, "max_pk": true, "min_x": true, "max_x": true } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.19.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.19.adm
new file mode 100644
index 0000000..54ce1e1
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.19.adm
@@ -0,0 +1 @@
+{ "metadata": { "DatasetName": "ds1", "IndexName": "sample_idx_1_ds1", "SampleCardinalityTarget": 17008, "SourceCardinality": 17100, "SourceAvgItemSize": true, "SampleSeed": true }, "stats": { "cnt": 16954, "min_pk": true, "max_pk": true, "min_x": true, "max_x": true } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.21.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.21.adm
new file mode 100644
index 0000000..979d35a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.21.adm
@@ -0,0 +1 @@
+{ "metadata": { "DatasetName": "ds1", "IndexName": "sample_idx_2_ds1", "SampleCardinalityTarget": 17008, "SourceCardinality": 17100, "SourceAvgItemSize": true, "SampleSeed": true }, "stats": { "cnt": 16954, "min_pk": true, "max_pk": true, "min_x": true, "max_x": true } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.9.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.9.adm
new file mode 100644
index 0000000..ef30e37
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-1/analyze-dataset-1.9.adm
@@ -0,0 +1 @@
+{ "metadata": { "DatasetName": "ds1", "IndexName": "sample_idx_1_ds1", "SampleCardinalityTarget": 1063, "SourceCardinality": 1100, "SourceAvgItemSize": true, "SampleSeed": true }, "stats": { "cnt": 1043, "min_pk": true, "max_pk": true, "min_x": true, "max_x": true } }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-with-indexes/analyze-dataset-with-indexes.04.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-with-indexes/analyze-dataset-with-indexes.04.adm
new file mode 100644
index 0000000..a68a44a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-with-indexes/analyze-dataset-with-indexes.04.adm
@@ -0,0 +1,3 @@
+{ "DatasetName": "ds1", "IndexName": "sample_idx_1_ds1", "IndexStructure": "SAMPLE", "SampleCardinalityTarget": 1063, "SourceCardinality": 1000, "SourceAvgItemSize": 369, "IndexStats": [ { "IndexName": "ds1_idx3", "NumPages": 16 }, { "IndexName": "ds1_idx2", "NumPages": 16 }, { "IndexName": "ds1_idx1", "NumPages": 16 } ] }
+{ "DatasetName": "ds2", "IndexName": "sample_idx_1_ds2", "IndexStructure": "SAMPLE", "SampleCardinalityTarget": 1063, "SourceCardinality": 1000, "SourceAvgItemSize": 369, "IndexStats": [ { "IndexName": "ds2_idx1", "NumPages": 16 } ] }
+{ "DatasetName": "ds3", "IndexName": "sample_idx_1_ds3", "IndexStructure": "SAMPLE", "SampleCardinalityTarget": 1063, "SourceCardinality": 1000, "SourceAvgItemSize": 369 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-with-indexes/analyze-dataset-with-indexes.06.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-with-indexes/analyze-dataset-with-indexes.06.adm
new file mode 100644
index 0000000..4180e4b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/ddl/analyze-dataset-with-indexes/analyze-dataset-with-indexes.06.adm
@@ -0,0 +1,3 @@
+{ "DatasetName": "ds1", "IndexName": "sample_idx_2_ds1", "IndexStructure": "SAMPLE", "SampleCardinalityTarget": 1063, "SourceCardinality": 1000, "SourceAvgItemSize": 369, "IndexStats": [ { "IndexName": "ds1_idx2", "NumPages": 16 }, { "IndexName": "ds1_idx1", "NumPages": 16 } ] }
+{ "DatasetName": "ds2", "IndexName": "sample_idx_1_ds2", "IndexStructure": "SAMPLE", "SampleCardinalityTarget": 1063, "SourceCardinality": 1000, "SourceAvgItemSize": 369, "IndexStats": [ { "IndexName": "ds2_idx1", "NumPages": 16 } ] }
+{ "DatasetName": "ds3", "IndexName": "sample_idx_1_ds3", "IndexStructure": "SAMPLE", "SampleCardinalityTarget": 1063, "SourceCardinality": 1000, "SourceAvgItemSize": 369 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/dml/insert-return-records/insert-return-records.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/dml/insert-return-records/insert-return-records.1.adm
new file mode 100644
index 0000000..efca021
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_static_partitioning/dml/insert-return-records/insert-return-records.1.adm
@@ -0,0 +1,5 @@
+{ "tweetid": 1, "message-text": "hello" }
+{ "tweetid": 2, "message-text": "goodbye" }
+{ "tweetid": 5, "message-text": "good" }
+{ "tweetid": 4, "message-text": "what" }
+{ "tweetid": 3, "message-text": "the end" }